X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2Fconfig.mk;h=773e3d22b67211a1c282d3b8dd6795de9f9fe588;hb=2e3af17125cdd3e5b4c7725dfadd15f4c8145484;hp=2a26346cf00b35966dcc112cd11e2926c4007e19;hpb=2ff5698bfa62a906813b899f91e1c89b30242798;p=goodfet

diff --git a/firmware/config.mk b/firmware/config.mk
index 2a26346..773e3d2 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -1,56 +1,61 @@
 ##################################
 ## These are production boards.
 ##################################
-mcu = undef
+
 
 ifneq (,$(findstring $(board),goodfet20 goodfet10 goodfet11))
-mcu := msp430x1612
+mcu ?= msp430f1612
 platform := goodfet
 endif
 
 ifneq (,$(findstring $(board),goodfet21))
-mcu := msp430x2618
+mcu ?= msp430f2618
 platform := goodfet
 endif
 
 ifneq (,$(findstring $(board),goodfet30 goodfet31))
-mcu := msp430x2274
+mcu ?= msp430f2274
 platform := goodfet
 # This will link to fit in a '2254, so unneeded packages should be omited.
 CONFIG_ccspi = n
 endif
 
 ifneq (,$(findstring $(board),goodfet40 goodfet41))
-mcu := msp430x2618
+mcu ?= msp430f2618
+platform := goodfet
+endif
+
+ifneq (,$(findstring $(board),goodfet24))
+mcu ?= msp430f2618
 platform := goodfet
 endif
 
 ifneq (,$(findstring $(board),nhb12b))
-mcu := msp430x2618
+mcu ?= msp430f2618
 CONFIG_nrf = y
 platform := nhb12b
 endif
 
 ifneq (,$(findstring $(board),nhb12))
-mcu := msp430x2618
+mcu ?= msp430f2618
 CONFIG_nrf = y
 platform := nhb12
 endif
 
 ifneq (,$(findstring $(board),goodfet50 goodfet51))
-mcu := msp430x5510
+mcu ?= msp430f5510
 platform := goodfet
 endif
 
 ifeq ($(board),telosb)
-mcu := msp430x1612
+mcu ?= msp430f1611
 platform := telosb
 config := monitor spi ccspi
 CFLAGS += -Duseuart1
 endif
 
 ifeq ($(board),telosbbt)
-mcu :=msp430x1612
+mcu ?=msp430f1612
 platform := telosb
 config := monitor spi ccspi
 endif
@@ -64,29 +69,29 @@ endif
 
 ifneq (,$(findstring $(board),donbfet))
 GCC := avr-gcc
-mcu := atmega644p
+mcu ?= atmega644p
 CFLAGS=$(DEBUG) -mmcu=$(mcu) -W -Os -mcall-prologues -Wall -Wextra -Wuninitialized -fpack-struct -fshort-enums -funsigned-bitfields
 config := monitor avr spi jscan
 endif
 
 ifneq (,$(findstring $(board),arduino))
 GCC := avr-gcc
-mcu := atmega168
+mcu ?= atmega168
 #BSL := avrdude -V -F -c stk500v1 -p m328p -b 57600 -P /dev/tty.usbserial-* -U flash:w:blink.hex
 LDFLAGS := 
 config := monitor
 endif
 
 ifneq (,$(findstring $(board),tilaunchpad))
-mcu :=msp430x1612
+mcu ?=msp430f1612
 CFLAGS := -DDEBUG_LEVEL=3 -DDEBUG_START=1 -DINBAND_DEBUG
-#CFLAGS+= -Werror
+CFLAGS+= -Werror -Wall
 config := monitor chipcon i2c
 endif
 
 
 
-
+mcu ?= undef
 ifeq ($(mcu),undef)
 $(error Please define board, as explained in the README)
 endif