Skip to content

Commit 3a5f79a

Browse files
tannewttannewt
authored
Merge pull request #2701 from hierophect/stm32-submodule-swap
STM32: Change ST drivers submodule to match TinyUSB
2 parents 85f44e2 + ef7370d commit 3a5f79a

File tree

5 files changed

+49
-54
lines changed

5 files changed

+49
-54
lines changed

‎.gitmodules

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
[submodule "tools/python-semver"]
3030
path = tools/python-semver
3131
url = https://github.com/k-bx/python-semver.git
32-
[submodule "lib/stm32lib"]
33-
path = lib/stm32lib
34-
url = https://github.com/micropython/stm32lib
35-
branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0
3632
[submodule "atmel-samd/asf4"]
3733
path = ports/atmel-samd/asf4
3834
url = https://github.com/adafruit/asf4.git
@@ -96,9 +92,6 @@
9692
[submodule "frozen/circuitpython-stage"]
9793
path = frozen/circuitpython-stage
9894
url = https://github.com/python-ugame/circuitpython-stage.git
99-
[submodule "ports/stm/stm32f4"]
100-
path = ports/stm/stm32f4
101-
url = https://github.com/adafruit/stm32f4.git
10295
[submodule "ports/cxd56/spresense-exported-sdk"]
10396
path = ports/cxd56/spresense-exported-sdk
10497
url = https://github.com/sonydevworld/spresense-exported-sdk.git
@@ -122,4 +115,7 @@
122115
url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI
123116
[submodule "frozen/Adafruit_CircuitPython_Requests"]
124117
path = frozen/Adafruit_CircuitPython_Requests
125-
url = https://github.com/adafruit/Adafruit_CircuitPython_Requests
118+
url = https://github.com/adafruit/Adafruit_CircuitPython_Requests
119+
[submodule "ports/stm/st_driver"]
120+
path = ports/stm/st_driver
121+
url = https://github.com/hathach/st_driver.git

‎conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
"ports/nrf/nrfx",
133133
"ports/nrf/peripherals",
134134
"ports/nrf/usb",
135-
"ports/stm/stm32f4",
135+
"ports/stm/st_driver",
136136
"ports/stm/peripherals",
137137
"ports/stm/ref",
138138
"ports/unix",

‎ports/stm/Makefile

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ INC += -I.
6666
INC += -I../..
6767
INC += -I$(BUILD)
6868
INC += -I$(BUILD)/genhdr
69-
INC += -I./stm32f4/STM32F4xx_HAL_Driver/Inc
70-
INC += -I./stm32f4/STM32F4xx_HAL_Driver/Inc/Legacy
71-
INC += -I./stm32f4/CMSIS/Device/ST/STM32F4xx/Include
72-
INC += -I./stm32f4/CMSIS/Include
69+
INC += -I./st_driver/STM32F4xx_HAL_Driver/Inc
70+
INC += -I./st_driver/STM32F4xx_HAL_Driver/Inc/Legacy
71+
INC += -I./st_driver/CMSIS/Device/ST/STM32F4xx/Include
72+
INC += -I./st_driver/CMSIS/Include
7373
INC += -I./boards
7474
INC += -I./boards/$(BOARD)
7575
INC += -I./peripherals
@@ -147,46 +147,45 @@ CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_STM32F4 -DCFG_TUD_CDC_RX_BUFSIZE=1024 -DCFG_TUD
147147
######################################
148148

149149
SRC_STM32 = \
150-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc.c \
151-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc_ex.c \
152-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c \
153-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac_ex.c \
154-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c.c \
155-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c_ex.c \
156-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_qspi.c \
157-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rng.c \
158-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc.c \
159-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc_ex.c \
160-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c \
161-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c \
162-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c \
163-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c \
164-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_usart.c \
165-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c \
166-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c \
167-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c \
168-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c \
169-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c \
170-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c \
171-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c \
172-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c \
173-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c \
174-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c \
175-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c \
176-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c \
177-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_exti.c \
178-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c \
179-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_gpio.c \
180-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_adc.c \
181-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c \
182-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fsmc.c \
183-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_i2c.c \
184-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma.c \
185-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c \
186-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usart.c \
187-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rcc.c \
188-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_utils.c \
189-
stm32f4/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_exti.c \
150+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc.c \
151+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc_ex.c \
152+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c \
153+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac_ex.c \
154+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c.c \
155+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c_ex.c \
156+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_qspi.c \
157+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rng.c \
158+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc.c \
159+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc_ex.c \
160+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c \
161+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c \
162+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c \
163+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c \
164+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_usart.c \
165+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c \
166+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c \
167+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c \
168+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c \
169+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c \
170+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c \
171+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c \
172+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c \
173+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c \
174+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c \
175+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c \
176+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c \
177+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_exti.c \
178+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c \
179+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_gpio.c \
180+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_adc.c \
181+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fsmc.c \
182+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_i2c.c \
183+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma.c \
184+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c \
185+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usart.c \
186+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_rcc.c \
187+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_utils.c \
188+
st_driver/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_exti.c \
190189
system_stm32f4xx.c
191190

192191

‎ports/stm/st_driver

Submodule st_driver added at 3fc2e0f

‎ports/stm/stm32f4

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)