git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4736 35acf78f-673a-0410-8e92-d51de3d6d3f4

4 files changed, 42 insertions, 25 deletions

diff --git a/os/ports/GCC/PPC/SPC560Pxx/bam.s b/os/ports/GCC/PPC/SPC560Pxx/bam.s
new file mode 100644
index 000000000..9da61c8f0
--- /dev/null
+++ b/os/ports/GCC/PPC/SPC560Pxx/bam.s
@@ -0,0 +1,38 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011,2012 Giovanni Di Sirio.

+

+    This file is part of ChibiOS/RT.

+

+    ChibiOS/RT is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+*/

+

+/**

+ * @file    SPC560Pxx/bam.s

+ * @brief   SPC560Pxx boot assistant record.

+ *

+ * @addtogroup PPC_CORE

+ * @{

+ */

+

+#if !defined(__DOXYGEN__)

+

+        /* BAM info, SWT off, WTE off, VLE from settings.*/

+        .section    .bam, "ax"

+        .long       0x015A0000

+        .long       _boot_address

+

+#endif /* !defined(__DOXYGEN__) */

+

+/** @} */

diff --git a/os/ports/GCC/PPC/SPC560Pxx/port.mk b/os/ports/GCC/PPC/SPC560Pxx/port.mk
index 388268b38..de516c7d0 100644
--- a/os/ports/GCC/PPC/SPC560Pxx/port.mk
+++ b/os/ports/GCC/PPC/SPC560Pxx/port.mk
@@ -1,9 +1,10 @@
 # List of the ChibiOS/RT SPC560Pxx port files.

 PORTSRC = ${CHIBIOS}/os/ports/GCC/PPC/chcore.c

 

-PORTASM = ${CHIBIOS}/os/ports/GCC/PPC/SPC560Pxx/vectors.s \

+PORTASM = ${CHIBIOS}/os/ports/GCC/PPC/bam.s \

+          ${CHIBIOS}/os/ports/GCC/PPC/crt0.s \

           ${CHIBIOS}/os/ports/GCC/PPC/SPC560Pxx/ivor.s \

-          ${CHIBIOS}/os/ports/GCC/PPC/crt0.s

+          ${CHIBIOS}/os/ports/GCC/PPC/SPC560Pxx/vectors.s

 

 PORTINC = ${CHIBIOS}/os/ports/GCC/PPC \

           ${CHIBIOS}/os/ports/GCC/PPC/SPC560Pxx

diff --git a/os/ports/GCC/PPC/SPC560Pxx/vectors.s b/os/ports/GCC/PPC/SPC560Pxx/vectors.s
index 1d09e9ce3..515fdd188 100644
--- a/os/ports/GCC/PPC/SPC560Pxx/vectors.s
+++ b/os/ports/GCC/PPC/SPC560Pxx/vectors.s
@@ -26,24 +26,8 @@
  * @{

  */

 

-/*

- * Imports the PPC configuration headers.

- */

-#define _FROM_ASM_

-#include "chconf.h"

-#include "chcore.h"

-

 #if !defined(__DOXYGEN__)

 

-        /* BAM info, SWT off, WTE off, VLE from settings.*/

-        .section    .bam, "ax"

-#if PPC_USE_VLE

-        .long       0x015A0000

-#else

-        .long       0x005A0000

-#endif

-        .long       _boot_address

-

         /* Software vectors table. The vectors are accessed from the IVOR4

            handler only. In order to declare an interrupt handler just create

            a function withe the same name of a vector, the symbol will

@@ -1099,7 +1083,7 @@ vector259:
         .weak       vector260

 vector260:

 

-        .weak      _unhandled_irq

+        .weak       _unhandled_irq

         .type       _unhandled_irq, @function

 _unhandled_irq:

          b          _unhandled_irq

diff --git a/os/ports/GCC/PPC/port.mk b/os/ports/GCC/PPC/port.mk
deleted file mode 100644
index 4f14365a4..000000000
--- a/os/ports/GCC/PPC/port.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# List of the ChibiOS/RT PPC port files.

-PORTSRC = ${CHIBIOS}/os/ports/GCC/PPC/chcore.c

-

-PORTASM = ${CHIBIOS}/os/ports/GCC/PPC/crt0.s

-

-PORTINC = ${CHIBIOS}/os/ports/GCC/PPC