switch stm32f4 to use st_driver submodule

This commit is contained in:
hathach 2019-09-05 22:12:43 +07:00
parent 56f1ccd68a
commit c4b384d22f
3 changed files with 32 additions and 26 deletions

View File

@ -2,32 +2,35 @@ CFLAGS += \
-DHSE_VALUE=8000000 \ -DHSE_VALUE=8000000 \
-DSTM32F407xx \ -DSTM32F407xx \
-mthumb \ -mthumb \
-mabi=aapcs-linux \ -mabi=aapcs \
-mcpu=cortex-m4 \ -mcpu=cortex-m4 \
-mfloat-abi=hard \ -mfloat-abi=hard \
-mfpu=fpv4-sp-d16 \ -mfpu=fpv4-sp-d16 \
-nostdlib -nostartfiles \ -nostdlib -nostartfiles \
-DCFG_TUSB_MCU=OPT_MCU_STM32F4 -DCFG_TUSB_MCU=OPT_MCU_STM32F4
ST_HAL_DRIVER = hw/mcu/st/st_driver/STM32F4xx_HAL_Driver
ST_CMSIS = hw/mcu/st/st_driver/CMSIS/Device/ST/STM32F4xx
# All source paths should be relative to the top level. # All source paths should be relative to the top level.
LD_FILE = hw/bsp/stm32f407disco/STM32F407VGTx_FLASH.ld LD_FILE = hw/bsp/stm32f407disco/STM32F407VGTx_FLASH.ld
SRC_C += \ SRC_C += \
hw/mcu/st/system-init/system_stm32f4xx.c \ $(ST_CMSIS)/Source/Templates/system_stm32f4xx.c \
hw/mcu/st/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c \ $(ST_HAL_DRIVER)/Src/stm32f4xx_hal.c \
hw/mcu/st/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c \ $(ST_HAL_DRIVER)/Src/stm32f4xx_hal_cortex.c \
hw/mcu/st/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c \ $(ST_HAL_DRIVER)/Src/stm32f4xx_hal_rcc.c \
hw/mcu/st/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c $(ST_HAL_DRIVER)/Src/stm32f4xx_hal_gpio.c
SRC_S += \ SRC_S += \
hw/mcu/st/startup/stm32f4/startup_stm32f407xx.s $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f407xx.s
INC += \ INC += \
$(TOP)/hw/mcu/st/cmsis \ $(TOP)/hw/mcu/st/st_driver/CMSIS/Include \
$(TOP)/hw/mcu/st/stm32lib/CMSIS/STM32F4xx/Include \ $(TOP)/$(ST_CMSIS)/Include \
$(TOP)/hw/mcu/st/stm32lib/STM32F4xx_HAL_Driver/Inc \ $(TOP)/$(ST_HAL_DRIVER)/Inc \
$(TOP)/hw/bsp/stm32f407disco $(TOP)/hw/bsp/$(BOARD)
# For TinyUSB port source # For TinyUSB port source
VENDOR = st VENDOR = st
CHIP_FAMILY = stm32f4 CHIP_FAMILY = stm32f4

View File

@ -2,31 +2,34 @@ CFLAGS += \
-DHSE_VALUE=8000000 \ -DHSE_VALUE=8000000 \
-DSTM32F411xE \ -DSTM32F411xE \
-mthumb \ -mthumb \
-mabi=aapcs-linux \ -mabi=aapcs \
-mcpu=cortex-m4 \ -mcpu=cortex-m4 \
-mfloat-abi=hard \ -mfloat-abi=hard \
-mfpu=fpv4-sp-d16 \ -mfpu=fpv4-sp-d16 \
-DCFG_TUSB_MCU=OPT_MCU_STM32F4 \ -nostdlib -nostartfiles \
-nostdlib -nostartfiles -DCFG_TUSB_MCU=OPT_MCU_STM32F4
ST_HAL_DRIVER = hw/mcu/st/st_driver/STM32F4xx_HAL_Driver
ST_CMSIS = hw/mcu/st/st_driver/CMSIS/Device/ST/STM32F4xx
# All source paths should be relative to the top level. # All source paths should be relative to the top level.
LD_FILE = hw/bsp/stm32f411disco/STM32F411VETx_FLASH.ld LD_FILE = hw/bsp/stm32f411disco/STM32F411VETx_FLASH.ld
SRC_C += \ SRC_C += \
hw/mcu/st/system-init/system_stm32f4xx.c \ $(ST_CMSIS)/Source/Templates/system_stm32f4xx.c \
hw/mcu/st/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c \ $(ST_HAL_DRIVER)/Src/stm32f4xx_hal.c \
hw/mcu/st/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c \ $(ST_HAL_DRIVER)/Src/stm32f4xx_hal_cortex.c \
hw/mcu/st/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c \ $(ST_HAL_DRIVER)/Src/stm32f4xx_hal_rcc.c \
hw/mcu/st/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c $(ST_HAL_DRIVER)/Src/stm32f4xx_hal_gpio.c
SRC_S += \ SRC_S += \
hw/mcu/st/startup/stm32f4/startup_stm32f411xe.s $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f411xe.s
INC += \ INC += \
$(TOP)/hw/mcu/st/cmsis \ $(TOP)/hw/mcu/st/st_driver/CMSIS/Include \
$(TOP)/hw/mcu/st/stm32lib/CMSIS/STM32F4xx/Include \ $(TOP)/$(ST_CMSIS)/Include \
$(TOP)/hw/mcu/st/stm32lib/STM32F4xx_HAL_Driver/Inc \ $(TOP)/$(ST_HAL_DRIVER)/Inc \
$(TOP)/hw/bsp/stm32f411disco $(TOP)/hw/bsp/$(BOARD)
# For TinyUSB port source # For TinyUSB port source
VENDOR = st VENDOR = st

@ -1 +1 @@
Subproject commit a5fef7cc227b23057266b4d19429e47626270491 Subproject commit acc346e98e646ba16b7c495ef3e9363d289b8ea1