X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fconfig.mk;h=86b6d5e328cd9ca467df7ffc28ddcb0553260a50;hp=2f45036e583c0014da7a6ced9be12d361ac28108;hb=b58937eb83447c1c3d073ed6343f5ac062f9f969;hpb=b91e76cd49b5b4da24685a5fcc622abdb32ac373

diff --git a/firmware/config.mk b/firmware/config.mk
index 2f45036..86b6d5e 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -20,6 +20,7 @@ mcu ?= msp430f2274
 platform := goodfet
 # This will link to fit in a '2254, so unneeded packages should be omited.
 CONFIG_ccspi = n
+CONFIG_nrf = y
 endif
 
 ifneq (,$(findstring $(board),goodfet40 goodfet41))
@@ -28,11 +29,47 @@ platform := goodfet
 CONFIG_nrf = y
 endif
 
-ifneq (,$(findstring $(board),zolertiaz1))
+ifneq (,$(findstring $(board),stm32f4discovery))
+
+periph ?= /opt/STM32F4xx_StdPeriph_Driver
+discovery ?= /opt/STM32F4-Discovery_FW_V1.1.0
+pincs ?=  -I$(periph)/inc -I$(discovery)/Libraries/CMSIS/ST/STM32F4xx/Include -I$(discovery)/Libraries/CMSIS/Include -Dassert_param\(x\)
+psrc ?=  /opt/STM32F4xx_StdPeriph_Driver/src
+
+
+GCC     = arm-none-eabi-gcc
+CC      = arm-none-eabi-gcc
+LD      = arm-none-eabi-ld -v
+AR      = arm-none-eabi-ar
+AS      = arm-none-eabi-as
+CP      = arm-none-eabi-objcopy
+OD	= arm-none-eabi-objdump
+CFLAGS  = -c -fno-common -O1 -g -mcpu=cortex-m3 -mthumb $(pincs)
+AFLAGS  = -ahls -mapcs-32
+LFLAGS  = -Ttmplink.cmd -nostartfiles
+CPFLAGS = -Obinary
+ODFLAGS	= -S
+LDFLAGS = 
+
+
+mcu ?= stm32f407
+platform := stm32f4discovery
+config = monitor
+extralibs = lib/cortexm3.o lib/system_stm32f4xx.o $(psrc)/stm32f4xx_rcc.o $(psrc)/stm32f4xx_gpio.o
+
+endif
+
+ifneq (,$(findstring $(board),facedancer10))
 mcu ?= msp430f2618
 platform := goodfet
-CONFIG_ccspi = y
-MSP430BSL?=z1-bsl --z1  --speed=38400
+config = monitor spi maxusb
+endif
+
+ifeq ($(board),z1)
+mcu ?= msp430f2617
+platform := z1
+config = monitor spi ccspi
+MSP430BSL?=goodfet.bsl --z1  --speed=38400
 endif
 
 ifneq (,$(findstring $(board),goodfet24))
@@ -80,8 +117,10 @@ endif
 
 ifneq (,$(findstring $(board),donbfet))
 GCC := avr-gcc
+CC := avr-gcc
 mcu ?= atmega644p
-CFLAGS=$(DEBUG) -mmcu=$(mcu) -W -Os -mcall-prologues -Wall -Wextra -Wuninitialized -fpack-struct -fshort-enums -funsigned-bitfields
+platform = donbfet
+CFLAGS=$(DEBUG) -Iinclude -mmcu=$(mcu) -W -Os -mcall-prologues -Wall -Wextra -Wuninitialized -fpack-struct -fshort-enums -funsigned-bitfields
 config := monitor avr spi jscan
 endif