diff options
| author | hathach <[email protected]> | 2020-10-30 12:55:54 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2020-10-30 12:55:54 +0700 |
| commit | 8850ea90b4b94611901602e99a7bd0952327db8d (patch) | |
| tree | da986bc5a051a9049fc1707dad5263a5c75dcd8c | |
| parent | 092f7baec02f8008d4d1f579c5094e7096db2183 (diff) | |
f1 use offical st driver repo
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | hw/bsp/stm32f103bluepill/board.mk | 17 | ||||
| m--------- | hw/mcu/st/cmsis_device_f1 | 0 | ||||
| m--------- | hw/mcu/st/stm32f1xx_hal_driver | 0 |
4 files changed, 15 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules index b2b706160..89dbed9fe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -43,3 +43,9 @@ [submodule "hw/mcu/st/stm32f0xx_hal_driver"] path = hw/mcu/st/stm32f0xx_hal_driver url = https://github.com/STMicroelectronics/stm32f0xx_hal_driver.git +[submodule "hw/mcu/st/cmsis_device_f1"] + path = hw/mcu/st/cmsis_device_f1 + url = https://github.com/STMicroelectronics/cmsis_device_f1.git +[submodule "hw/mcu/st/stm32f1xx_hal_driver"] + path = hw/mcu/st/stm32f1xx_hal_driver + url = https://github.com/STMicroelectronics/stm32f1xx_hal_driver.git diff --git a/hw/bsp/stm32f103bluepill/board.mk b/hw/bsp/stm32f103bluepill/board.mk index 124b16021..8ab973776 100644 --- a/hw/bsp/stm32f103bluepill/board.mk +++ b/hw/bsp/stm32f103bluepill/board.mk @@ -11,19 +11,20 @@ CFLAGS += \ # mcu driver cause following warnings #CFLAGS += -Wno-error=unused-parameter -ST_HAL_DRIVER = hw/mcu/st/st_driver/STM32F1xx_HAL_Driver -ST_CMSIS = hw/mcu/st/st_driver/CMSIS/Device/ST/STM32F1xx +ST_FAMILY = f1 +ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) +ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver # All source paths should be relative to the top level. LD_FILE = hw/bsp/$(BOARD)/STM32F103XB_FLASH.ld SRC_C += \ - $(ST_CMSIS)/Source/Templates/system_stm32f1xx.c \ - $(ST_HAL_DRIVER)/Src/stm32f1xx_hal.c \ - $(ST_HAL_DRIVER)/Src/stm32f1xx_hal_cortex.c \ - $(ST_HAL_DRIVER)/Src/stm32f1xx_hal_rcc.c \ - $(ST_HAL_DRIVER)/Src/stm32f1xx_hal_rcc_ex.c \ - $(ST_HAL_DRIVER)/Src/stm32f1xx_hal_gpio.c + $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_cortex.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_rcc_ex.c \ + $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal_gpio.c SRC_S += \ $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f103xb.s diff --git a/hw/mcu/st/cmsis_device_f1 b/hw/mcu/st/cmsis_device_f1 new file mode 160000 +Subproject 6601104a6397299b7304fd5bcd9a491f56cb23a diff --git a/hw/mcu/st/stm32f1xx_hal_driver b/hw/mcu/st/stm32f1xx_hal_driver new file mode 160000 +Subproject 1dd9d3662fb7eb2a7f7d3bc0a4c1dc7537915a2 |