From 57b8a904723d78057bd50add2f49696c75d12dff Mon Sep 17 00:00:00 2001 From: travisutk Date: Sun, 6 May 2012 14:18:13 +0000 Subject: [PATCH] Closer to STM32 USB, but sticking with USART for initial bringup. git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@1161 12e2690d-a6be-4b82-a7b7-67c4a43b65c8 --- firmware/config.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/firmware/config.mk b/firmware/config.mk index 71b9a58..20562c9 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 $(psrc)/stm32f4xx_rcc.o $(psrc)/stm32f4xx_gpio.o $(psrc)/stm32f4xx_usart.o $(usblibs) endif -- 2.20.1