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

diff --git a/firmware/config.mk b/firmware/config.mk
index 86b6d5e..76c118f 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),apimote))
+mcu ?= msp430f2618
+platform := apimote
+config := monitor spi ccspi
+MSP430BSL?=goodfet.bsl --speed=38400 --swap-reset-test
+CFLAGS += -Duseuart1
+endif
+
 ifneq (,$(findstring $(board),goodfet20 goodfet10 goodfet11))
 mcu ?= msp430f1612
 platform := goodfet
@@ -33,7 +41,13 @@ 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\)
+
+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
 
 
@@ -55,11 +69,14 @@ LDFLAGS =
 mcu ?= stm32f407
 platform := stm32f4discovery
 config = monitor
-extralibs = lib/cortexm3.o lib/system_stm32f4xx.o $(psrc)/stm32f4xx_rcc.o $(psrc)/stm32f4xx_gpio.o
+
+# 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))
+ifneq (,$(findstring $(board),facedancer10 facedancer11))
 mcu ?= msp430f2618
 platform := goodfet
 config = monitor spi maxusb