projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updates to use the ARMresettarget() for "goodfet.arm7 reset" which uses the nRST pin
[goodfet]
/
firmware
/
config.mk
diff --git
a/firmware/config.mk
b/firmware/config.mk
index
e7b256d
..
8ed0785
100644
(file)
--- a/
firmware/config.mk
+++ b/
firmware/config.mk
@@
-2,29
+2,29
@@
## These are production boards.
##################################
## These are production boards.
##################################
-#Unset by default, but can be explicitly
set later
.
-config
=
undef
+#Unset by default, but can be explicitly
overwritten
.
+config
?=
undef
-ifneq (,$(findstring $(board),apimote1))
+ifneq (,$(findstring $(board),apimote1
apimote
))
mcu ?= msp430f2618
mcu ?= msp430f2618
-platform := apimote
1
+platform := apimote
config := monitor spi ccspi
MSP430BSL?=goodfet.bsl --speed=38400 --swap-reset-test
CFLAGS += -Duseuart1 -Dapimote
endif
config := monitor spi ccspi
MSP430BSL?=goodfet.bsl --speed=38400 --swap-reset-test
CFLAGS += -Duseuart1 -Dapimote
endif
-ifneq (,$(findstring $(board),goodthopter01 goodthopter10))
+ifneq (,$(findstring $(board),goodthopter01 goodthopter10
goodthopter11
))
mcu ?= msp430f2274
platform := goodfet
config := monitor spi
endif
ifneq (,$(findstring $(board),goodfet20 goodfet10 goodfet11))
mcu ?= msp430f2274
platform := goodfet
config := monitor spi
endif
ifneq (,$(findstring $(board),goodfet20 goodfet10 goodfet11))
-mcu ?= msp430f161
2
+mcu ?= msp430f161
1
platform := goodfet
endif
platform := goodfet
endif
-ifneq (,$(findstring $(board),goodfet21))
+ifneq (,$(findstring $(board),goodfet21
,goodfet22
))
mcu ?= msp430f2618
platform := goodfet
endif
mcu ?= msp430f2618
platform := goodfet
endif
@@
-37,7
+37,7
@@
CONFIG_ccspi = n
CONFIG_nrf = y
endif
CONFIG_nrf = y
endif
-ifneq (,$(findstring $(board),goodfet40 goodfet41))
+ifneq (,$(findstring $(board),goodfet40 goodfet41
goodfet42
))
mcu ?= msp430f2618
platform := goodfet
CONFIG_nrf = y
mcu ?= msp430f2618
platform := goodfet
CONFIG_nrf = y
@@
-158,7
+158,7
@@
endif
ifneq (,$(findstring $(board),tilaunchpad))
mcu ?=msp430f1612
CFLAGS := -DDEBUG_LEVEL=3 -DDEBUG_START=1 -DINBAND_DEBUG
ifneq (,$(findstring $(board),tilaunchpad))
mcu ?=msp430f1612
CFLAGS := -DDEBUG_LEVEL=3 -DDEBUG_START=1 -DINBAND_DEBUG
-CFLAGS+= -W
error -W
all
+CFLAGS+= -Wall
config := monitor chipcon i2c
endif
config := monitor chipcon i2c
endif
@@
-181,7
+181,7
@@
CONFIG_sbw ?= n
CONFIG_jtag430 ?= y
CONFIG_jtag430x2 ?= y
CONFIG_i2c ?= n
CONFIG_jtag430 ?= y
CONFIG_jtag430x2 ?= y
CONFIG_i2c ?= n
-CONFIG_jtagarm7 ?=
n
+CONFIG_jtagarm7 ?=
y
CONFIG_ejtag ?= n
CONFIG_jtagxscale ?= n
CONFIG_openocd ?= y
CONFIG_ejtag ?= n
CONFIG_jtagxscale ?= n
CONFIG_openocd ?= y