Mass platform updates for GCC 4.6.3

diff --git a/support/make/eyesIFXv1.target b/support/make/eyesIFXv1.target
index f42a81d5d7b4b965de5075db0cfeb4caa2dd079e..adbc481219a4c1b1e3bad0631f60bfe9a53f9af1 100644 (file)
--- a/support/make/eyesIFXv1.target
+++ b/support/make/eyesIFXv1.target
@@ -3,7 +3,7 @@
 
 PLATFORM = eyesIFXv1
 
-MSP_MCU = msp430x149
+MSP_MCU = msp430f149
 
 # Remove MSP430 hardware multiply disable: new msp430-gcc fixes
 # PFLAGS += -mdisable-hwmul

diff --git a/support/make/eyesIFXv2.target b/support/make/eyesIFXv2.target
index 808c4114b213266befdfcd3f7911fcf3612362f3..9ddf0974d62454b1ae22e6384b2cce06b98ca0a9 100644 (file)
--- a/support/make/eyesIFXv2.target
+++ b/support/make/eyesIFXv2.target
@@ -3,7 +3,7 @@
 
 PLATFORM = eyesIFXv2
 
-MSP_MCU = msp430x1611
+MSP_MCU = msp430f1611
 
 #Flash Config
 VOLUME_FILE = volumes-at45db.xml

diff --git a/support/make/msp/msp.rules b/support/make/msp/msp.rules
index 0bab085a81954165c4f39898ddd819c51846fef6..b052feb364d88c48a1b8ef0a29fcf23a504a5b94 100644 (file)
--- a/support/make/msp/msp.rules
+++ b/support/make/msp/msp.rules
@@ -29,7 +29,7 @@ endif
 
 #MSP_NESC_TARGET ?= msp430
 #MSP_GCC ?= msp430-gcc
-#MSP_MCU ?= msp430x149
+#MSP_MCU ?= msp430f149
 #PFLAGS += -fnesc-target=$(MSP_NESC_TARGET) -gcc=$(MSP_GCC) -mmcu=$(MSP_MCU)
 
 OBJCOPY = msp430-objcopy

diff --git a/support/make/olimexp169.target b/support/make/olimexp169.target
index a2759ab0e2690bdc985f54ca19e56456c69e13ca..7446fae5b564eae67d8a2b01530ade7f22ffc69e 100644 (file)
--- a/support/make/olimexp169.target
+++ b/support/make/olimexp169.target
@@ -3,7 +3,7 @@
 
 PLATFORM ?= olimexp169
 
-#MSP_MCU = msp430x169
+#MSP_MCU = msp430f169
 
 # Disable MSP430 hardware multiply because it makes MSPGCC die
 PFLAGS += -mdisable-hwmul

diff --git a/support/make/telosa.target b/support/make/telosa.target
index b77ffa188b3a67f39927711e8fe92fb1d267c75a..7fd6ac5f4f5a0eb91e3e8a2a975ba3e011611578 100644 (file)
--- a/support/make/telosa.target
+++ b/support/make/telosa.target
@@ -3,7 +3,7 @@
 
 PLATFORM ?= telosa
 
-MSP_MCU = msp430x149
+MSP_MCU = msp430f149
 
 # Remove MSP430 hardware multiply disable: new msp430-gcc fixes
 # PFLAGS += -mdisable-hwmul

diff --git a/support/make/telosb.target b/support/make/telosb.target
index c73c7606f38358943db1fd86ebf60abb19a3481f..55015a4b386434f8d9255a9589d6720d9bcd8864 100644 (file)
--- a/support/make/telosb.target
+++ b/support/make/telosb.target
@@ -3,7 +3,7 @@
 
 PLATFORM ?= telosb
 
-#MSP_MCU = msp430x1611
+#MSP_MCU = msp430f1611
 
 # Remove MSP430 hardware multiply disable: new msp430-gcc fixes
 # PFLAGS += -mdisable-hwmul

diff --git a/support/make/tmicore.target b/support/make/tmicore.target
index ce13879647aab1017bd02926b9d808a4a345534e..9cc9fdb9bd7426036da50137d3af52987a9ac378 100644 (file)
--- a/support/make/tmicore.target
+++ b/support/make/tmicore.target
@@ -3,7 +3,7 @@
 
 PLATFORM ?= tmicore
 
-#MSP_MCU = msp430x2417
+#MSP_MCU = msp430f2417
 
 # Remove MSP430 hardware multiply disable: new msp430-gcc fixes
 # PFLAGS += -mdisable-hwmul

diff --git a/support/make/tmirws.target b/support/make/tmirws.target
index cfea045bfecbf70520f4a7c0645d3b50e52f18d5..2420317691161c07e5721d82aa69314538ab55f8 100644 (file)
--- a/support/make/tmirws.target
+++ b/support/make/tmirws.target
@@ -3,7 +3,7 @@
 
 PLATFORM ?= tmirws
 
-#MSP_MCU = msp430x2417
+#MSP_MCU = msp430f2417
 
 # Disable MSP430 hardware multiply because it makes MSPGCC die
 # PFLAGS += -mdisable-hwmul

diff --git a/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app b/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app
index dcd1d972eb57a901dc782082ed9c3595a721de09..480b24cde3b659efad400ae828d2f38ebaa0ac4a 100755 (executable)
--- a/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app
+++ b/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app
@@ -37,7 +37,7 @@ FLAG=$2
 GCC="msp430-gcc"
 OBJCOPY="msp430-objcopy"
 NESCFLAGS="-target=telosb -x nesc -fnesc-target=msp430"
-CFLAGS="-c -gcc=$GCC -mmcu=msp430x1611 -Os -mdisable-hwmul -Wall -Wshadow"
+CFLAGS="-c -gcc=$GCC -mmcu=msp430f1611 -Os -mdisable-hwmul -Wall -Wshadow"
 
 OBJFILE=`basename $CFILE .c`.o
 BINFILE=`basename $CFILE .c`.bin

diff --git a/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app.1 b/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app.1
index 5f6abc298ce9d646f9d6f5db4b174458db9f3343..a08d0da3d0c02064d50b5f4c2b14c727677cf66f 100755 (executable)
--- a/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app.1
+++ b/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app.1
@@ -15,7 +15,7 @@ FLAG=$2
 GCC="msp430-gcc"
 OBJCOPY="msp430-objcopy"
 NESCFLAGS="-target=telosb -x nesc -fnesc-target=msp430"
-CFLAGS="-c -gcc=$GCC -mmcu=msp430x1611 -Os -mdisable-hwmul -Wall -Wshadow"
+CFLAGS="-c -gcc=$GCC -mmcu=msp430f1611 -Os -mdisable-hwmul -Wall -Wshadow"
 
 OBJFILE=`basename $CFILE .c`.o
 BINFILE=`basename $CFILE .c`.bin

diff --git a/tos/chips/msp430/adc12/Msp430Adc12.h b/tos/chips/msp430/adc12/Msp430Adc12.h
index da9e8359bd8e590b3f051e1fe5af86e04dec4f16..b3c22323427f2e58e4f91258edea57969f74077f 100644 (file)
--- a/tos/chips/msp430/adc12/Msp430Adc12.h
+++ b/tos/chips/msp430/adc12/Msp430Adc12.h
@@ -176,7 +176,7 @@ enum sampcon_id_enum
   //
   // Until the ADC driver is updated our temporary workaround is to re-define
   // the old structures -- this may may result in faulty ADC code and should be
-  // checked carefully for your specific device (note: msp430x1611 is safe)!
+  // checked carefully for your specific device (note: msp430f1611 is safe)!
 
 #warning "Accessing Adc12 registers via bitfield structures: this is discouraged mspgcc version >= 4 as it may result in faulty code!" 
 

diff --git a/tos/platforms/epic/.platform b/tos/platforms/epic/.platform
index 49ae20554e5be92a260d2b11c3b14bf8be1cd7c1..5fa9237f82db66d3327b73e17c5681c24889acf7 100644 (file)
--- a/tos/platforms/epic/.platform
+++ b/tos/platforms/epic/.platform
@@ -46,7 +46,7 @@ push( @includes, qw(
 # The @opts list contains parameters that are passed to ncc.
 @opts = qw(
   -gcc=msp430-gcc
-  -mmcu=msp430x1611
+  -mmcu=msp430f1611
   -fnesc-target=msp430
   -fnesc-no-debug
 );

diff --git a/tos/platforms/eyesIFX/eyesIFXv1/.platform b/tos/platforms/eyesIFX/eyesIFXv1/.platform
index 5e37b74f1ccffce03cd50bafb5be3abec2c170d6..b556b3a9cff7dbdee1b97eb380f760d581b076ba 100644 (file)
--- a/tos/platforms/eyesIFX/eyesIFXv1/.platform
+++ b/tos/platforms/eyesIFX/eyesIFXv1/.platform
@@ -12,6 +12,6 @@ push( @includes, qw(
 
 push ( @opts, qw(
 
-  -mmcu=msp430x149
+  -mmcu=msp430f149
 ) );
 

diff --git a/tos/platforms/eyesIFX/eyesIFXv2/.platform b/tos/platforms/eyesIFX/eyesIFXv2/.platform
index 473901eff16230c6e0bdc247d928e6aac92f52c7..8a6a649d4b9e8d2b1e47211ceaa41538850e6911 100644 (file)
--- a/tos/platforms/eyesIFX/eyesIFXv2/.platform
+++ b/tos/platforms/eyesIFX/eyesIFXv2/.platform
@@ -12,5 +12,5 @@ push( @includes, qw(
 
 push ( @opts, qw(
 
-  -mmcu=msp430x1611
+  -mmcu=msp430f1611
 ) );

diff --git a/tos/platforms/olimexp169/.platform b/tos/platforms/olimexp169/.platform
index 7c9db3b8f942fff3ad1fe06d3d397e1c3f29d03b..a429069ccd14c67f299d2efb9511f570909f4708 100644 (file)
--- a/tos/platforms/olimexp169/.platform
+++ b/tos/platforms/olimexp169/.platform
@@ -21,7 +21,7 @@ push( @includes, qw(
 
 @opts = qw(
   -gcc=msp430-gcc
-  -mmcu=msp430x169
+  -mmcu=msp430f169
   -fnesc-target=msp430
   -fnesc-no-debug
 );

diff --git a/tos/platforms/shimmer/.platform b/tos/platforms/shimmer/.platform
index 1a3a7e8db078ae31f566c41005353be606c87274..dafbf906663d37ba88e627e2bf45eedce708e860 100644 (file)
--- a/tos/platforms/shimmer/.platform
+++ b/tos/platforms/shimmer/.platform
@@ -45,7 +45,7 @@ push( @includes, qw(
 @opts = qw(
 
   -gcc=msp430-gcc
-  -mmcu=msp430x1611
+  -mmcu=msp430f1611
   -fnesc-target=msp430
   -fnesc-no-debug
 );

diff --git a/tos/platforms/shimmer2/.platform b/tos/platforms/shimmer2/.platform
index df824e8f6c1f4a731100c3ddc71e8c01bcea7f4f..353c1274aa5d01d7c048678979aa4f8eb49c1baf 100644 (file)
--- a/tos/platforms/shimmer2/.platform
+++ b/tos/platforms/shimmer2/.platform
@@ -51,7 +51,7 @@ push( @includes, qw(
 @opts = qw(
 
   -gcc=msp430-gcc
-  -mmcu=msp430x1611
+  -mmcu=msp430f1611
   -fnesc-target=msp430
   -fnesc-no-debug
 );

diff --git a/tos/platforms/telosa/.platform b/tos/platforms/telosa/.platform
index 2f27395042856cdadb4c1045eb861d02dccecbc7..581ff064d179ff8d0e1c3f53b3df99eebd6f9aab 100644 (file)
--- a/tos/platforms/telosa/.platform
+++ b/tos/platforms/telosa/.platform
@@ -42,7 +42,7 @@ push( @includes, qw(
 @opts = qw(
 
   -gcc=msp430-gcc
-  -mmcu=msp430x149
+  -mmcu=msp430f149
   -fnesc-target=msp430
   -fnesc-no-debug
 

diff --git a/tos/platforms/telosb/.platform b/tos/platforms/telosb/.platform
index 25c6401cbc070b9c0f4deaa77de138d18f48c0e1..10c8dd74d4b16b5d139a3db39b675b7248105525 100644 (file)
--- a/tos/platforms/telosb/.platform
+++ b/tos/platforms/telosb/.platform
@@ -44,7 +44,7 @@ push( @includes, qw(
 @opts = qw(
 
   -gcc=msp430-gcc
-  -mmcu=msp430x1611
+  -mmcu=msp430f1611
   -fnesc-target=msp430
   -fnesc-no-debug
 );

diff --git a/tos/platforms/tinynode/.platform b/tos/platforms/tinynode/.platform
index 818c7a836490b191872037b526ba6925d10499af..527ff84fa6b7834a61e34420322a03ab084a2a3f 100644 (file)
--- a/tos/platforms/tinynode/.platform
+++ b/tos/platforms/tinynode/.platform
@@ -35,7 +35,7 @@ push( @includes, qw(
 
 @opts = qw(
        -gcc=msp430-gcc
-       -mmcu=msp430x1611
+       -mmcu=msp430f1611
         -fnesc-target=msp430
         -fnesc-no-debug);
 

diff --git a/tos/platforms/tmimsp/.family b/tos/platforms/tmimsp/.family
index 313b32dc524ee55f37161dd3c1fa0fbf316517c1..2455688bd904630755a77f6ef2386464672cd586 100644 (file)
--- a/tos/platforms/tmimsp/.family
+++ b/tos/platforms/tmimsp/.family
@@ -33,7 +33,7 @@ push( @includes, qw(
 
 @opts = qw(
   -gcc=msp430-gcc
-  -mmcu=msp430x2417
+  -mmcu=msp430f2417
   -fnesc-target=msp430
   -fnesc-no-debug
 );