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

12 files changed, 36 insertions, 30 deletions

diff --git a/demos/SPC5/NIL-SPC560D-EVB/Makefile b/demos/SPC5/NIL-SPC560D-EVB/Makefile
index d0b8ac03f..b2cb5f740 100644
--- a/demos/SPC5/NIL-SPC560D-EVB/Makefile
+++ b/demos/SPC5/NIL-SPC560D-EVB/Makefile
@@ -129,11 +129,12 @@ INCDIR = $(CHIBIOS)/os/license \
 # Compiler settings

 #

 

-#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200z0 -meabi -msdata=none -mregnames

+#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames # HighTec

+MCU  = e200z0 -meabi -msdata=none -mregnames # Free GCC

 

 #TRGT = ppc-vle-

-TRGT = powerpc-eabivle-

+#TRGT = powerpc-eabivle-

+TRGT = ppc-freevle-eabi-

 CC   = $(TRGT)gcc

 CPPC = $(TRGT)g++

 # Enable loading with g++ only if you need C++ runtime support.

diff --git a/demos/SPC5/RT-SPC560B-EVB/Makefile b/demos/SPC5/RT-SPC560B-EVB/Makefile
index 7dacac4df..1dcec9b2d 100644
--- a/demos/SPC5/RT-SPC560B-EVB/Makefile
+++ b/demos/SPC5/RT-SPC560B-EVB/Makefile
@@ -133,11 +133,12 @@ INCDIR = $(CHIBIOS)/os/license \
 # Compiler settings

 #

 

-#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200z0 -meabi -msdata=none -mregnames

+#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames # HighTec

+MCU  = e200z0 -meabi -msdata=none -mregnames # Free GCC

 

 #TRGT = ppc-vle-

-TRGT = powerpc-eabivle-

+#TRGT = powerpc-eabivle-

+TRGT = ppc-freevle-eabi-

 CC   = $(TRGT)gcc

 CPPC = $(TRGT)g++

 # Enable loading with g++ only if you need C++ runtime support.

diff --git a/demos/SPC5/RT-SPC560D-EVB/.cproject b/demos/SPC5/RT-SPC560D-EVB/.cproject
index 03d4fd009..f74af61c9 100644
--- a/demos/SPC5/RT-SPC560D-EVB/.cproject
+++ b/demos/SPC5/RT-SPC560D-EVB/.cproject
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?fileVersion 4.0.0?>

-

-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

 	<storageModule moduleId="org.eclipse.cdt.core.settings">

 		<cconfiguration id="0.665946016">

 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.665946016" moduleId="org.eclipse.cdt.core.settings" name="Default">

diff --git a/demos/SPC5/RT-SPC560D-EVB/Makefile b/demos/SPC5/RT-SPC560D-EVB/Makefile
index f8079a253..17d0108ff 100644
--- a/demos/SPC5/RT-SPC560D-EVB/Makefile
+++ b/demos/SPC5/RT-SPC560D-EVB/Makefile
@@ -133,11 +133,12 @@ INCDIR = $(CHIBIOS)/os/license \
 # Compiler settings

 #

 

-#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200z0 -meabi -msdata=none -mregnames

+#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames # HighTec

+MCU  = e200z0 -meabi -msdata=none -mregnames # Free GCC

 

 #TRGT = ppc-vle-

-TRGT = powerpc-eabivle-

+#TRGT = powerpc-eabivle-

+TRGT = ppc-freevle-eabi-

 CC   = $(TRGT)gcc

 CPPC = $(TRGT)g++

 # Enable loading with g++ only if you need C++ runtime support.

diff --git a/demos/SPC5/RT-SPC560P-EVB/Makefile b/demos/SPC5/RT-SPC560P-EVB/Makefile
index cf5a358be..9a847de2e 100644
--- a/demos/SPC5/RT-SPC560P-EVB/Makefile
+++ b/demos/SPC5/RT-SPC560P-EVB/Makefile
@@ -133,11 +133,12 @@ INCDIR = $(CHIBIOS)/os/license \
 # Compiler settings

 #

 

-#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200z0 -meabi -msdata=none -mregnames

+#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames # HighTec

+MCU  = e200z0 -meabi -msdata=none -mregnames # Free GCC

 

 #TRGT = ppc-vle-

-TRGT = powerpc-eabivle-

+#TRGT = powerpc-eabivle-

+TRGT = ppc-freevle-eabi-

 CC   = $(TRGT)gcc

 CPPC = $(TRGT)g++

 # Enable loading with g++ only if you need C++ runtime support.

diff --git a/demos/SPC5/RT-SPC563M-EVB/Makefile b/demos/SPC5/RT-SPC563M-EVB/Makefile
index ac52f61f5..7ec8501fd 100644
--- a/demos/SPC5/RT-SPC563M-EVB/Makefile
+++ b/demos/SPC5/RT-SPC563M-EVB/Makefile
@@ -133,11 +133,12 @@ INCDIR = $(CHIBIOS)/os/license \
 # Compiler settings

 #

 

-#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200z0 -meabi -msdata=none -mregnames

+#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames # HighTec

+MCU  = e200z3 -meabi -msdata=none -mregnames # Free GCC

 

 #TRGT = ppc-vle-

-TRGT = powerpc-eabivle-

+#TRGT = powerpc-eabivle-

+TRGT = ppc-freevle-eabi-

 CC   = $(TRGT)gcc

 CPPC = $(TRGT)g++

 # Enable loading with g++ only if you need C++ runtime support.

diff --git a/demos/SPC5/RT-SPC564A-EVB/Makefile b/demos/SPC5/RT-SPC564A-EVB/Makefile
index 8ad7d5df3..114bd8d87 100644
--- a/demos/SPC5/RT-SPC564A-EVB/Makefile
+++ b/demos/SPC5/RT-SPC564A-EVB/Makefile
@@ -133,11 +133,12 @@ INCDIR = $(CHIBIOS)/os/license \
 # Compiler settings

 #

 

-#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200z0 -meabi -msdata=none -mregnames

+#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames # HighTec

+MCU  = e200z4 -meabi -msdata=none -mregnames # Free GCC

 

 #TRGT = ppc-vle-

-TRGT = powerpc-eabivle-

+#TRGT = powerpc-eabivle-

+TRGT = ppc-freevle-eabi-

 CC   = $(TRGT)gcc

 CPPC = $(TRGT)g++

 # Enable loading with g++ only if you need C++ runtime support.

diff --git a/demos/SPC5/RT-SPC56EC-EVB/Makefile b/demos/SPC5/RT-SPC56EC-EVB/Makefile
index 965773bd9..1cfe85049 100644
--- a/demos/SPC5/RT-SPC56EC-EVB/Makefile
+++ b/demos/SPC5/RT-SPC56EC-EVB/Makefile
@@ -133,11 +133,12 @@ INCDIR = $(CHIBIOS)/os/license \
 # Compiler settings

 #

 

-#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200z0 -meabi -msdata=none -mregnames

+#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames # HighTec

+MCU  = e200z4 -meabi -msdata=none -mregnames # Free GCC

 

 #TRGT = ppc-vle-

-TRGT = powerpc-eabivle-

+#TRGT = powerpc-eabivle-

+TRGT = ppc-freevle-eabi-

 CC   = $(TRGT)gcc

 CPPC = $(TRGT)g++

 # Enable loading with g++ only if you need C++ runtime support.

diff --git a/demos/SPC5/RT-SPC56EL-EVB/Makefile b/demos/SPC5/RT-SPC56EL-EVB/Makefile
index dbaca89ca..9ae00d026 100644
--- a/demos/SPC5/RT-SPC56EL-EVB/Makefile
+++ b/demos/SPC5/RT-SPC56EL-EVB/Makefile
@@ -133,11 +133,12 @@ INCDIR = $(CHIBIOS)/os/license \
 # Compiler settings

 #

 

-#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames

-MCU  = e200z0 -meabi -msdata=none -mregnames

+#MCU  = e200zx -meabi -msdata=none -mnew-mnemonics -mregnames # HighTec

+MCU  = e200z4 -meabi -msdata=none -mregnames # Free GCC

 

 #TRGT = ppc-vle-

-TRGT = powerpc-eabivle-

+#TRGT = powerpc-eabivle-

+TRGT = ppc-freevle-eabi-

 CC   = $(TRGT)gcc

 CPPC = $(TRGT)g++

 # Enable loading with g++ only if you need C++ runtime support.

diff --git a/os/common/startup/e200/devices/SPC564Axx/boot.S b/os/common/startup/e200/devices/SPC564Axx/boot.S
index b1097e058..28f34dae0 100644
--- a/os/common/startup/e200/devices/SPC564Axx/boot.S
+++ b/os/common/startup/e200/devices/SPC564Axx/boot.S
@@ -292,7 +292,7 @@ _coreinit:
         e_li        r3, LICSR1_ICINV

         mtspr       1011, r3       /* LICSR1 */

 .inv:   mfspr       r3, 1011       /* LICSR1 */

-        e_andi.     r3, r3, LICSR1_ICINV

+        e_and2i.    r3, LICSR1_ICINV

         se_bne      .inv

         e_lis       r3, BOOT_LICSR1_DEFAULT@h

         e_or2i      r3, BOOT_LICSR1_DEFAULT@l

diff --git a/os/common/startup/e200/devices/SPC56ECxx/boot.S b/os/common/startup/e200/devices/SPC56ECxx/boot.S
index d0ff80107..c47300a44 100644
--- a/os/common/startup/e200/devices/SPC56ECxx/boot.S
+++ b/os/common/startup/e200/devices/SPC56ECxx/boot.S
@@ -342,7 +342,7 @@ _coreinit:
         e_li        r3, LICSR1_ICINV

         mtspr       1011, r3       /* LICSR1 */

 .inv:   mfspr       r3, 1011       /* LICSR1 */

-        e_andi.     r3, r3, LICSR1_ICINV

+        e_and2i.    r3, LICSR1_ICINV

         se_bne      .inv

         e_lis       r3, BOOT_LICSR1_DEFAULT@h

         e_or2i      r3, BOOT_LICSR1_DEFAULT@l

diff --git a/os/common/startup/e200/devices/SPC56ELxx/boot.S b/os/common/startup/e200/devices/SPC56ELxx/boot.S
index d65714020..f438d8fc8 100644
--- a/os/common/startup/e200/devices/SPC56ELxx/boot.S
+++ b/os/common/startup/e200/devices/SPC56ELxx/boot.S
@@ -345,7 +345,7 @@ _coreinit:
         e_li        r3, LICSR1_ICINV

         mtspr       1011, r3       /* LICSR1 */

 .inv:   mfspr       r3, 1011       /* LICSR1 */

-        e_andi.     r3, r3, LICSR1_ICINV

+        e_and2i.    r3, LICSR1_ICINV

         se_bne      .inv

         e_lis       r3, BOOT_LICSR1_DEFAULT@h

         e_or2i      r3, BOOT_LICSR1_DEFAULT@l