From bf2b0de8125634c3cb1187ddf2a078a7ee08cf7c Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Tue, 19 Aug 2014 09:31:09 -0600 Subject: [PATCH] Mass platform updates for GCC 4.6.3 --- support/make/eyesIFXv1.target | 2 +- support/make/eyesIFXv2.target | 2 +- support/make/msp/msp.rules | 2 +- support/make/olimexp169.target | 2 +- support/make/telosa.target | 2 +- support/make/telosb.target | 2 +- support/make/tmicore.target | 2 +- support/make/tmirws.target | 2 +- tools/tinyos/tosthreads/tosthreads-gen-dynamic-app | 2 +- tools/tinyos/tosthreads/tosthreads-gen-dynamic-app.1 | 2 +- tos/chips/msp430/adc12/Msp430Adc12.h | 2 +- tos/platforms/epic/.platform | 2 +- tos/platforms/eyesIFX/eyesIFXv1/.platform | 2 +- tos/platforms/eyesIFX/eyesIFXv2/.platform | 2 +- tos/platforms/olimexp169/.platform | 2 +- tos/platforms/shimmer/.platform | 2 +- tos/platforms/shimmer2/.platform | 2 +- tos/platforms/telosa/.platform | 2 +- tos/platforms/telosb/.platform | 2 +- tos/platforms/tinynode/.platform | 2 +- tos/platforms/tmimsp/.family | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/support/make/eyesIFXv1.target b/support/make/eyesIFXv1.target index f42a81d5..adbc4812 100644 --- 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 808c4114..9ddf0974 100644 --- 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 0bab085a..b052feb3 100644 --- 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 a2759ab0..7446fae5 100644 --- 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 b77ffa18..7fd6ac5f 100644 --- 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 c73c7606..55015a4b 100644 --- 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 ce138796..9cc9fdb9 100644 --- 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 cfea045b..24203176 100644 --- 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 dcd1d972..480b24cd 100755 --- 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 5f6abc29..a08d0da3 100755 --- 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 da9e8359..b3c22323 100644 --- 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 49ae2055..5fa9237f 100644 --- 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 5e37b74f..b556b3a9 100644 --- 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 473901ef..8a6a649d 100644 --- 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 7c9db3b8..a429069c 100644 --- 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 1a3a7e8d..dafbf906 100644 --- 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 df824e8f..353c1274 100644 --- 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 2f273950..581ff064 100644 --- 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 25c6401c..10c8dd74 100644 --- 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 818c7a83..527ff84f 100644 --- 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 313b32dc..2455688b 100644 --- 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 ); -- 2.39.2