projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changes to the GUI to allow for better loading and writing as well as tested our...
[goodfet]
/
firmware
/
config.mk
diff --git
a/firmware/config.mk
b/firmware/config.mk
index
f001b48
..
84ff47f
100644
(file)
--- a/
firmware/config.mk
+++ b/
firmware/config.mk
@@
-41,6
+41,7
@@
ifneq (,$(findstring $(board),goodfet40 goodfet41 goodfet42))
mcu ?= msp430f2618
platform := goodfet
CONFIG_nrf = y
mcu ?= msp430f2618
platform := goodfet
CONFIG_nrf = y
+CONFIG_ccspi = y
endif
ifneq (,$(findstring $(board),stm32f4discovery))
endif
ifneq (,$(findstring $(board),stm32f4discovery))
@@
-82,7
+83,7
@@
extralibs = lib/cortexm3.o lib/system_stm32f4xx.o lib/stm32f4xx_rcc.o $(psrc)/st
endif
endif
-ifneq (,$(findstring $(board),facedancer10 facedancer11))
+ifneq (,$(findstring $(board),facedancer10 facedancer11
facedancer20 facedancer21
))
mcu ?= msp430f2618
platform := goodfet
config = monitor spi maxusb
mcu ?= msp430f2618
platform := goodfet
config = monitor spi maxusb
@@
-99,6
+100,7
@@
ifneq (,$(findstring $(board),goodfet24))
mcu ?= msp430f2618
platform := goodfet
CONFIG_glitch = y
mcu ?= msp430f2618
platform := goodfet
CONFIG_glitch = y
+CONFIG_nrf = y
endif
ifneq (,$(findstring $(board),nhb12b))
endif
ifneq (,$(findstring $(board),nhb12b))
@@
-150,10
+152,11
@@
endif
ifneq (,$(findstring $(board),zigduino))
GCC := avr-gcc
CC := avr-gcc
ifneq (,$(findstring $(board),zigduino))
GCC := avr-gcc
CC := avr-gcc
-mcu ?= atmega128
4p
-platform =
donbfet
+mcu ?= atmega128
rfa1
+platform =
zigduino
CFLAGS=$(DEBUG) -Iinclude -mmcu=$(mcu) -W -Os -mcall-prologues -Wall -Wextra -Wuninitialized -fpack-struct -fshort-enums -funsigned-bitfields
CFLAGS=$(DEBUG) -Iinclude -mmcu=$(mcu) -W -Os -mcall-prologues -Wall -Wextra -Wuninitialized -fpack-struct -fshort-enums -funsigned-bitfields
-config := monitor #avr spi
+config := monitor atmel_radio #avr spi
+AVR_PLATFORM := m128rfa1
endif
endif
@@
-180,7
+183,7
@@
$(error Please define board, as explained in the README)
endif
#platform := $(board)
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 maxusb
+AVAILABLE_APPS = monitor spi jtag sbw jtag430 jtag430x2 i2c jtagarm7 ejtag jtagxscale openocd chipcon avr pic adc nrf ccspi glitch smartcard ps2 slc2 maxusb
atmel_radio cc2500
# defaults
CONFIG_monitor ?= y
# defaults
CONFIG_monitor ?= y
@@
-201,10
+204,12
@@
CONFIG_pic ?= n
CONFIG_adc ?= n
CONFIG_nrf ?= n
CONFIG_ccspi ?= n
CONFIG_adc ?= n
CONFIG_nrf ?= n
CONFIG_ccspi ?= n
+CONFIG_cc2500 ?= y
CONFIG_glitch ?= n
CONFIG_smartcard ?= n
CONFIG_ps2 ?= n
CONFIG_slc2 ?= n
CONFIG_glitch ?= n
CONFIG_smartcard ?= n
CONFIG_ps2 ?= n
CONFIG_slc2 ?= n
+CONFIG_atmel_radio ?=n
#The CONFIG_foo vars are only interpreted if $(config) is "unset".
ifeq ($(config),undef)
#The CONFIG_foo vars are only interpreted if $(config) is "unset".
ifeq ($(config),undef)