summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2020-10-30 13:40:20 +0700
committerhathach <[email protected]>2020-10-30 13:40:20 +0700
commitac231d7b2d45618c813cfd76988170c0dfa164d8 (patch)
tree71daeb79c90d9a790bea05d19314ce7dfeef33a0
parent3659d8e89a8918f27d339cbc3688301b5ed2b2d8 (diff)
l0 use offical st driver repo
-rw-r--r--.gitmodules6
-rw-r--r--hw/bsp/stm32l0538disco/board.mk17
-rw-r--r--hw/bsp/stm32l0538disco/stm32l0538disco.c4
m---------hw/mcu/st/cmsis_device_l00
m---------hw/mcu/st/stm32l0xx_hal_driver0
5 files changed, 17 insertions, 10 deletions
diff --git a/.gitmodules b/.gitmodules
index 6a75df141..3255977a2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -73,3 +73,9 @@
[submodule "hw/mcu/st/stm32h7xx_hal_driver"]
path = hw/mcu/st/stm32h7xx_hal_driver
url = https://github.com/STMicroelectronics/stm32h7xx_hal_driver.git
+[submodule "hw/mcu/st/cmsis_device_l0"]
+ path = hw/mcu/st/cmsis_device_l0
+ url = https://github.com/STMicroelectronics/cmsis_device_l0.git
+[submodule "hw/mcu/st/stm32l0xx_hal_driver"]
+ path = hw/mcu/st/stm32l0xx_hal_driver
+ url = https://github.com/STMicroelectronics/stm32l0xx_hal_driver.git
diff --git a/hw/bsp/stm32l0538disco/board.mk b/hw/bsp/stm32l0538disco/board.mk
index bcfaee7ac..49818e3a3 100644
--- a/hw/bsp/stm32l0538disco/board.mk
+++ b/hw/bsp/stm32l0538disco/board.mk
@@ -12,19 +12,20 @@ CFLAGS += \
# mcu driver cause following warnings
CFLAGS += -Wno-error=unused-parameter -Wno-error=maybe-uninitialized
-ST_HAL_DRIVER = hw/mcu/st/st_driver/STM32L0xx_HAL_Driver
-ST_CMSIS = hw/mcu/st/st_driver/CMSIS/Device/ST/STM32L0xx
+ST_FAMILY = l0
+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)/STM32L053C8Tx_FLASH.ld
SRC_C += \
- $(ST_CMSIS)/Source/Templates/system_stm32l0xx.c \
- $(ST_HAL_DRIVER)/Src/stm32l0xx_hal.c \
- $(ST_HAL_DRIVER)/Src/stm32l0xx_hal_cortex.c \
- $(ST_HAL_DRIVER)/Src/stm32l0xx_hal_rcc.c \
- $(ST_HAL_DRIVER)/Src/stm32l0xx_hal_rcc_ex.c \
- $(ST_HAL_DRIVER)/Src/stm32l0xx_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_stm32l053xx.s
diff --git a/hw/bsp/stm32l0538disco/stm32l0538disco.c b/hw/bsp/stm32l0538disco/stm32l0538disco.c
index ab04e5c51..f0f1d028b 100644
--- a/hw/bsp/stm32l0538disco/stm32l0538disco.c
+++ b/hw/bsp/stm32l0538disco/stm32l0538disco.c
@@ -127,7 +127,7 @@ void board_init(void)
GPIO_InitStruct.Pin = LED_PIN;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_PULLUP;
- GPIO_InitStruct.Speed = GPIO_SPEED_FAST;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(LED_PORT, &GPIO_InitStruct);
board_led_write(false);
@@ -137,7 +137,7 @@ void board_init(void)
GPIO_InitStruct.Pin = BUTTON_PIN;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct.Pull = GPIO_PULLDOWN;
- GPIO_InitStruct.Speed = GPIO_SPEED_FAST;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(BUTTON_PORT, &GPIO_InitStruct);
// USB
diff --git a/hw/mcu/st/cmsis_device_l0 b/hw/mcu/st/cmsis_device_l0
new file mode 160000
+Subproject 06748ca1f93827befdb8b794402320d94d02004
diff --git a/hw/mcu/st/stm32l0xx_hal_driver b/hw/mcu/st/stm32l0xx_hal_driver
new file mode 160000
+Subproject fbdacaf6f8c82a4e1eb9bd74ba650b491e97e17