X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fconfig.mk;h=0adba783274cb7fc974ca117579860e961099148;hp=71b9a58964f2802cbb2baed92ea431ea8027126f;hb=45b238c82383c390657cdf1be8b9c64b7214dc94;hpb=60c3c89f25870849e5c64dd415429822f483bc3f

diff --git a/firmware/config.mk b/firmware/config.mk
index 71b9a58..0adba78 100644
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -33,7 +33,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,7 +61,10 @@ 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