X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fconfig.mk;h=26573363bb80d84879a8f49037b01e45654525c5;hp=34f007992cfe2da1473aaaee9c17e1d9794701e1;hb=0fdb361ae1af20139c5751a1b6151e5e065a31b3;hpb=ebd308ba418fec3765e7b55ebcddd923111ba57b

diff --git a/firmware/config.mk b/firmware/config.mk
index 34f0079..2657336 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -5,6 +5,14 @@
 #Unset by default, but can be explicitly set later.
 config=undef
 
+ifneq (,$(findstring $(board),apimote1))
+mcu ?= msp430f2618
+platform := apimote1
+config := monitor spi ccspi
+MSP430BSL?=goodfet.bsl --speed=38400 --swap-reset-test
+CFLAGS += -Duseuart1 -Dapimote
+endif
+
 ifneq (,$(findstring $(board),goodfet20 goodfet10 goodfet11))
 mcu ?= msp430f1612
 platform := goodfet
@@ -29,6 +37,51 @@ platform := goodfet
 CONFIG_nrf = y
 endif
 
+ifneq (,$(findstring $(board),stm32f4discovery))
+
+periph ?= /opt/STM32F4xx_StdPeriph_Driver
+discovery ?= /opt/STM32F4-Discovery_FW_V1.1.0
+
+usbcore ?= $(discovery)/Libraries/STM32_USB_Device_Library/Core
+usbsrc ?= $(usbcore)/src
+otginc ?= /opt/STM32F4-Discovery_FW_V1.1.0/Libraries/STM32_USB_OTG_Driver/inc
+otgsrc ?= /opt/STM32F4-Discovery_FW_V1.1.0/Libraries/STM32_USB_OTG_Driver/src
+
+pincs ?=  -I$(periph)/inc -I$(usbcore)/inc -I$(otginc) -I$(discovery)/Libraries/CMSIS/ST/STM32F4xx/Include  -I$(discovery)/Libraries/CMSIS/Include -Dassert_param\(x\)= -DUSE_USB_OTG_FS -I/opt/STM32F4-Discovery_FW_V1.1.0/Utilities/STM32F4-Discovery
+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
+
+# This is a pain.
+#usblibs =  $(usbsrc)/usbd_core.o $(usbsrc)/usbd_req.o $(usbsrc)/usbd_ioreq.o $(usbsrc)/usbd_core.o $(otgsrc)/usb_dcd.o $(otgsrc)/usb_dcd_int.o $(otgsrc)/usb_hcd.o $(otgsrc)/usb_hcd_int.o $(otgsrc)/usb_otg.o
+extralibs = lib/cortexm3.o lib/system_stm32f4xx.o lib/stm32f4xx_rcc.o $(psrc)/stm32f4xx_gpio.o $(psrc)/stm32f4xx_usart.o $(usblibs) 
+
+endif
+
+ifneq (,$(findstring $(board),facedancer10 facedancer11))
+mcu ?= msp430f2618
+platform := goodfet
+config = monitor spi maxusb
+endif
+
 ifeq ($(board),z1)
 mcu ?= msp430f2617
 platform := z1
@@ -81,8 +134,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