From 6c57849d532dc63ade01d96c1a1a32ce53d7be18 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 5 Dec 2013 11:27:27 +0000
Subject: [PATCH] git-svn-id:
 svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6557
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/rt/RT-SPC56EL-EVB/.cproject              |  7 ++++++-
 demos/rt/RT-SPC56EL-EVB/Makefile               |  2 +-
 os/common/ports/e200/compilers/GCC/vectors.h   | 18 ++++++++++++++++++
 os/hal/boards/ST_EVB_SPC56EL/board.h           |  2 +-
 .../ports/e200/compilers/GCC/ivor.s            |  2 +-
 .../e200/compilers/GCC/mk/port_spc56elxx.mk    |  4 ++--
 6 files changed, 29 insertions(+), 6 deletions(-)
 rename os/{common => rt}/ports/e200/compilers/GCC/ivor.s (97%)

diff --git a/demos/rt/RT-SPC56EL-EVB/.cproject b/demos/rt/RT-SPC56EL-EVB/.cproject
index ac5bc86e0..88dcf471d 100644
--- a/demos/rt/RT-SPC56EL-EVB/.cproject
+++ b/demos/rt/RT-SPC56EL-EVB/.cproject
@@ -48,5 +48,10 @@
 		</scannerConfigBuildInfo>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Default">
+			<resource resourceType="PROJECT" workspacePath="/RT-SPC56EL-EVB"/>
+		</configuration>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 </cproject>
diff --git a/demos/rt/RT-SPC56EL-EVB/Makefile b/demos/rt/RT-SPC56EL-EVB/Makefile
index 34ed121bc..6f3898e9c 100644
--- a/demos/rt/RT-SPC56EL-EVB/Makefile
+++ b/demos/rt/RT-SPC56EL-EVB/Makefile
@@ -73,7 +73,7 @@ PROJECT = ch
 CHIBIOS = ../../..
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/hal/boards/ST_EVB_SPC56EL/board.mk
-include $(CHIBIOS)/os/hal/ports/SPC56ELxx/platform.mk
+include $(CHIBIOS)/os/hal/ports/SPC5/SPC56ELxx/platform.mk
 include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/rt/osal/osal.mk
 include $(CHIBIOS)/os/rt/ports/e200/compilers/GCC/mk/port_spc56elxx.mk
diff --git a/os/common/ports/e200/compilers/GCC/vectors.h b/os/common/ports/e200/compilers/GCC/vectors.h
index ce175e652..60241864e 100644
--- a/os/common/ports/e200/compilers/GCC/vectors.h
+++ b/os/common/ports/e200/compilers/GCC/vectors.h
@@ -35,10 +35,16 @@
 /* Module constants.                                                         */
 /*===========================================================================*/
 
+/* The following code is not processed when the file is included from an
+   asm module.*/
+#if !defined(_FROM_ASM_)
+
 #define INTC_MCR        *((volatile uint32_t *)0xfff48000)
 #define INTC_CPR        *((volatile uint32_t *)0xfff48008)
 #define INTC_IACKR      *((volatile uint32_t *)0xfff48010)
 
+#endif /* !defined(_FROM_ASM_) */
+
 /*===========================================================================*/
 /* Module pre-compile time settings.                                         */
 /*===========================================================================*/
@@ -59,6 +65,10 @@
 /* External declarations.                                                    */
 /*===========================================================================*/
 
+/* The following code is not processed when the file is included from an
+   asm module.*/
+#if !defined(_FROM_ASM_)
+
 #if !defined(__DOXYGEN__)
 extern uint32_t _vectors[PPC_NUM_VECTORS];
 #endif
@@ -71,10 +81,16 @@ extern "C" {
 }
 #endif
 
+#endif /* !defined(_FROM_ASM_) */
+
 /*===========================================================================*/
 /* Module inline functions.                                                  */
 /*===========================================================================*/
 
+/* The following code is not processed when the file is included from an
+   asm module.*/
+#if !defined(_FROM_ASM_)
+
 static inline void intc_init(void) {
 
   INTC_MCR   = 0;
@@ -82,6 +98,8 @@ static inline void intc_init(void) {
   INTC_IACKR = (uint32_t)_vectors;
 }
 
+#endif /* !defined(_FROM_ASM_) */
+
 #endif /* _VECTORS_H_ */
 
 /** @} */
diff --git a/os/hal/boards/ST_EVB_SPC56EL/board.h b/os/hal/boards/ST_EVB_SPC56EL/board.h
index 5c64e99bb..d6bc39115 100644
--- a/os/hal/boards/ST_EVB_SPC56EL/board.h
+++ b/os/hal/boards/ST_EVB_SPC56EL/board.h
@@ -18,7 +18,7 @@
 #define _BOARD_H_
 
 /*
- * Setup for a generic SPC560Pxx proto board.
+ * Setup for a generic SPC56ELxx proto board.
  */
 
 /*
diff --git a/os/common/ports/e200/compilers/GCC/ivor.s b/os/rt/ports/e200/compilers/GCC/ivor.s
similarity index 97%
rename from os/common/ports/e200/compilers/GCC/ivor.s
rename to os/rt/ports/e200/compilers/GCC/ivor.s
index 6d24c0b30..f26917252 100644
--- a/os/common/ports/e200/compilers/GCC/ivor.s
+++ b/os/rt/ports/e200/compilers/GCC/ivor.s
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file    PPC/ivor.s
+ * @file    ivor.s
  * @brief   Kernel ISRs.
  *
  * @addtogroup PPC_CORE
diff --git a/os/rt/ports/e200/compilers/GCC/mk/port_spc56elxx.mk b/os/rt/ports/e200/compilers/GCC/mk/port_spc56elxx.mk
index 1237ad3f4..adf2d5cb8 100644
--- a/os/rt/ports/e200/compilers/GCC/mk/port_spc56elxx.mk
+++ b/os/rt/ports/e200/compilers/GCC/mk/port_spc56elxx.mk
@@ -3,8 +3,8 @@ PORTSRC = ${CHIBIOS}/os/rt/ports/e200/chcore.c
           
 PORTASM = $(CHIBIOS)/os/common/ports/e200/devices/SPC56ELxx/boot.s \
           $(CHIBIOS)/os/common/ports/e200/compilers/GCC/vectors.s \
-          $(CHIBIOS)/os/common/ports/e200/compilers/GCC/ivor.s \
-          $(CHIBIOS)/os/common/ports/e200/compilers/GCC/crt0.s
+          $(CHIBIOS)/os/common/ports/e200/compilers/GCC/crt0.s \
+          $(CHIBIOS)/os/rt/ports/e200/compilers/GCC/ivor.s
 
 PORTINC = ${CHIBIOS}/os/common/ports/e200/compilers/GCC \
           ${CHIBIOS}/os/common/ports/e200/devices/SPC56ELxx \