X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fconfig.mk;h=e1e9d1c1a91e97c6bd9dd4420446019b8177b18c;hp=0392839ed1c5fe296c1f4e5f67f7f04198f312f7;hb=92ea7762796ae5588a43d41f32515238ade44d79;hpb=d0798f2be465edde4181142393359297e745d39c

diff --git a/firmware/config.mk b/firmware/config.mk
index 0392839..e1e9d1c 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -1,59 +1,65 @@
 ##################################
 ## These are production boards.
 ##################################
-mcu = undef
+
+#Unset by default, but can be explicitly set later.
+config=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
+CONFIG_glitch = y
 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
 
-ifneq (,$(findstring $(board),telosb))
-mcu :=msp430x1612
-platform := goodfet
-CFLAGS := -Dtelosb
-#CFLAGS+= -Werror
+ifeq ($(board),telosb)
+mcu ?= msp430f1611
+platform := telosb
 config := monitor spi ccspi
+CFLAGS += -Duseuart1
 endif
 
-ifneq (,$(findstring $(board),telosbbt))
-mcu :=msp430x1612
-platform := goodfet
-#CFLAGS+= -Werror
+ifeq ($(board),telosbbt)
+mcu ?=msp430f1612
+platform := telosb
 config := monitor spi ccspi
 endif
 
@@ -66,39 +72,40 @@ 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
 #platform := $(board)
 
-AVAILABLE_APPS = monitor spi jtag sbw jtag430 jtag430x2 i2c jtagarm7 ejtag jtagxscale openocd chipcon avr pic adc nrf ccspi glitch smartcard ps2 slc2 
+AVAILABLE_APPS = monitor spi jtag sbw jtag430 jtag430x2 i2c jtagarm7 ejtag jtagxscale openocd chipcon avr pic adc nrf ccspi glitch smartcard ps2 slc2  maxusb
 
 # defaults
 CONFIG_monitor    ?= y
 CONFIG_spi        ?= y
+CONFIG_maxusb     ?= y
 CONFIG_jtag       ?= n
 CONFIG_sbw        ?= n
 CONFIG_jtag430    ?= y
@@ -113,13 +120,13 @@ CONFIG_avr        ?= y
 CONFIG_pic        ?= n
 CONFIG_adc        ?= n
 CONFIG_nrf        ?= n
-CONFIG_ccspi      ?= y
+CONFIG_ccspi      ?= n
 CONFIG_glitch     ?= n
 CONFIG_smartcard  ?= n
 CONFIG_ps2        ?= n
 CONFIG_slc2       ?= n
 
-#The CONFIG_foo vars are only interpreted if $(config) is unset.
+#The CONFIG_foo vars are only interpreted if $(config) is "unset".
 ifeq ($(config),undef)
 config += $(foreach app,$(AVAILABLE_APPS),$(if $(findstring $(CONFIG_$(app)),y yes t true Y YES T TRUE),$(app)))
 endif