Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change ST drivers to use ST's driver repos as submodules #5976

Merged
merged 5 commits into from
Feb 4, 2022
Merged

Change ST drivers to use ST's driver repos as submodules #5976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e305aa
Removed submodule st_driver
sgauche Feb 3, 2022
92c9be9
change st_driver to use ST's github drivers as submodules
sgauche Feb 3, 2022
3d1b2b6
remove ST's stm32f4xx_hal_driver submodule due to bug in qspi driver
sgauche Feb 3, 2022
70ba229
add adafruit/stm32f4xx_hal_driver submodule
sgauche Feb 3, 2022
b2b6575
Merge branch 'adafruit:main' into st_drivers_to_submodules
sgauche Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 81 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,6 @@
[submodule "frozen/Adafruit_CircuitPython_Requests"]
path = frozen/Adafruit_CircuitPython_Requests
url = https://github.com/adafruit/Adafruit_CircuitPython_Requests
[submodule "ports/stm/st_driver"]
path = ports/stm/st_driver
url = https://github.com/hathach/st_driver.git
[submodule "lib/protomatter"]
path = lib/protomatter
url = https://github.com/adafruit/Adafruit_Protomatter
Expand Down Expand Up @@ -199,3 +196,84 @@
url = https://github.com/raspberrypi/rpi-firmware.git
branch = master
shallow = true
[submodule "ports/stm/st_driver/cmsis_device_f4"]
path = ports/stm/st_driver/cmsis_device_f4
url = https://github.com/STMicroelectronics/cmsis_device_f4.git
[submodule "ports/stm/st_driver/cmsis_device_f0"]
path = ports/stm/st_driver/cmsis_device_f0
url = https://github.com/STMicroelectronics/cmsis_device_f0.git
[submodule "ports/stm/st_driver/stm32f0xx_hal_driver"]
path = ports/stm/st_driver/stm32f0xx_hal_driver
url = https://github.com/STMicroelectronics/stm32f0xx_hal_driver.git
[submodule "ports/stm/st_driver/cmsis_device_f1"]
path = ports/stm/st_driver/cmsis_device_f1
url = https://github.com/STMicroelectronics/cmsis_device_f1.git
[submodule "ports/stm/st_driver/stm32f1xx_hal_driver"]
path = ports/stm/st_driver/stm32f1xx_hal_driver
url = https://github.com/STMicroelectronics/stm32f1xx_hal_driver.git
[submodule "ports/stm/st_driver/cmsis_device_f2"]
path = ports/stm/st_driver/cmsis_device_f2
url = https://github.com/STMicroelectronics/cmsis_device_f2.git
[submodule "ports/stm/st_driver/stm32f2xx_hal_driver"]
path = ports/stm/st_driver/stm32f2xx_hal_driver
url = https://github.com/STMicroelectronics/stm32f2xx_hal_driver.git
[submodule "ports/stm/st_driver/cmsis_device_f3"]
path = ports/stm/st_driver/cmsis_device_f3
url = https://github.com/STMicroelectronics/cmsis_device_f3.git
[submodule "ports/stm/st_driver/stm32f3xx_hal_driver"]
path = ports/stm/st_driver/stm32f3xx_hal_driver
url = https://github.com/STMicroelectronics/stm32f3xx_hal_driver.git
[submodule "ports/stm/st_driver/cmsis_device_f7"]
path = ports/stm/st_driver/cmsis_device_f7
url = https://github.com/STMicroelectronics/cmsis_device_f7.git
[submodule "ports/stm/st_driver/stm32f7xx_hal_driver"]
path = ports/stm/st_driver/stm32f7xx_hal_driver
url = https://github.com/STMicroelectronics/stm32f7xx_hal_driver.git
[submodule "ports/stm/st_driver/cmsis_device_h7"]
path = ports/stm/st_driver/cmsis_device_h7
url = https://github.com/STMicroelectronics/cmsis_device_h7.git
[submodule "ports/stm/st_driver/stm32h7xx_hal_driver"]
path = ports/stm/st_driver/stm32h7xx_hal_driver
url = https://github.com/STMicroelectronics/stm32h7xx_hal_driver.git
[submodule "ports/stm/st_driver/cmsis_device_l0"]
path = ports/stm/st_driver/cmsis_device_l0
url = https://github.com/STMicroelectronics/cmsis_device_l0.git
[submodule "ports/stm/st_driver/stm32l0xx_hal_driver"]
path = ports/stm/st_driver/stm32l0xx_hal_driver
url = https://github.com/STMicroelectronics/stm32l0xx_hal_driver.git
[submodule "ports/stm/st_driver/cmsis_device_l1"]
path = ports/stm/st_driver/cmsis_device_l1
url = https://github.com/STMicroelectronics/cmsis_device_l1.git
[submodule "ports/stm/st_driver/stm32l1xx_hal_driver"]
path = ports/stm/st_driver/stm32l1xx_hal_driver
url = https://github.com/STMicroelectronics/stm32l1xx_hal_driver.git
[submodule "ports/stm/st_driver/cmsis_device_l4"]
path = ports/stm/st_driver/cmsis_device_l4
url = https://github.com/STMicroelectronics/cmsis_device_l4.git
[submodule "ports/stm/st_driver/stm32l4xx_hal_driver"]
path = ports/stm/st_driver/stm32l4xx_hal_driver
url = https://github.com/STMicroelectronics/stm32l4xx_hal_driver.git
[submodule "ports/stm/st_driver/cmsis_device_g0"]
path = ports/stm/st_driver/cmsis_device_g0
url = https://github.com/STMicroelectronics/cmsis_device_g0.git
[submodule "ports/stm/st_driver/stm32g0xx_hal_driver"]
path = ports/stm/st_driver/stm32g0xx_hal_driver
url = https://github.com/STMicroelectronics/stm32g0xx_hal_driver.git
[submodule "ports/stm/st_driver/cmsis_device_g4"]
path = ports/stm/st_driver/cmsis_device_g4
url = https://github.com/STMicroelectronics/cmsis_device_g4.git
[submodule "ports/stm/st_driver/stm32g4xx_hal_driver"]
path = ports/stm/st_driver/stm32g4xx_hal_driver
url = https://github.com/STMicroelectronics/stm32g4xx_hal_driver.git
[submodule "ports/stm/st_driver/cmsis_device_l5"]
path = ports/stm/st_driver/cmsis_device_l5
url = https://github.com/STMicroelectronics/cmsis_device_l5.git
[submodule "ports/stm/st_driver/stm32l5xx_hal_driver"]
path = ports/stm/st_driver/stm32l5xx_hal_driver
url = https://github.com/STMicroelectronics/stm32l5xx_hal_driver.git
[submodule "ports/stm/st_driver/CMSIS_5"]
path = ports/stm/st_driver/CMSIS_5
url = https://github.com/ARM-software/CMSIS_5.git
[submodule "ports/stm/st_driver/stm32f4xx_hal_driver"]
path = ports/stm/st_driver/stm32f4xx_hal_driver
url = https://github.com/adafruit/stm32f4xx_hal_driver.git
8 changes: 4 additions & 4 deletions ports/stm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,16 @@ CROSS_COMPILE = arm-none-eabi-
MCU_SERIES_LOWER = $(shell echo $(MCU_SERIES) | tr '[:upper:]' '[:lower:]')
MCU_VARIANT_LOWER = $(shell echo $(MCU_VARIANT) | tr '[:upper:]' '[:lower:]')

HAL_DIR=st_driver/STM32$(MCU_SERIES)xx_HAL_Driver
HAL_DIR=st_driver/stm32$(MCU_SERIES_LOWER)xx_hal_driver

INC += -I.
INC += -I../..
INC += -I$(BUILD)
INC += -I$(BUILD)/genhdr
INC += -I./$(HAL_DIR)/Inc
INC += -I./$(HAL_DIR)/Inc/Legacy
INC += -I./st_driver/CMSIS/Device/ST/STM32$(MCU_SERIES)xx/Include
INC += -I./st_driver/CMSIS/Include
INC += -I./st_driver/cmsis_device_$(MCU_SERIES_LOWER)/Include
INC += -I./st_driver/CMSIS_5/CMSIS/Core/Include
INC += -I./boards
INC += -I./boards/$(BOARD)
INC += -I./hal_conf
Expand Down Expand Up @@ -242,7 +242,7 @@ endif

SRC_S = \
supervisor/cpu.s \
st_driver/CMSIS/Device/ST/STM32$(MCU_SERIES)xx/Source/Templates/gcc/startup_$(MCU_VARIANT_LOWER).s
st_driver/cmsis_device_$(MCU_SERIES_LOWER)/Source/Templates/gcc/startup_$(MCU_VARIANT_LOWER).s

SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
$(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \
Expand Down
1 change: 0 additions & 1 deletion ports/stm/st_driver
Open in desktop
Submodule st_driver deleted from 190083
1 change: 1 addition & 0 deletions ports/stm/st_driver/CMSIS_5
Open in desktop
Submodule CMSIS_5 added at 0b5217
1 change: 1 addition & 0 deletions ports/stm/st_driver/cmsis_device_f0
Open in desktop
Submodule cmsis_device_f0 added at 8b8619
1 change: 1 addition & 0 deletions ports/stm/st_driver/cmsis_device_f1
Open in desktop
Submodule cmsis_device_f1 added at 71ad5b
1 change: 1 addition & 0 deletions ports/stm/st_driver/cmsis_device_f2
Open in desktop
Submodule cmsis_device_f2 added at 694c49
1 change: 1 addition & 0 deletions ports/stm/st_driver/cmsis_device_f3
Open in desktop
Submodule cmsis_device_f3 added at 167eef
1 change: 1 addition & 0 deletions ports/stm/st_driver/cmsis_device_f4
Open in desktop
Submodule cmsis_device_f4 added at 6fe2c1
1 change: 1 addition & 0 deletions ports/stm/st_driver/cmsis_device_f7
Open in desktop
Submodule cmsis_device_f7 added at d29a89
1 change: 1 addition & 0 deletions ports/stm/st_driver/cmsis_device_g0
Open in desktop
Submodule cmsis_device_g0 added at 4daf76
1 change: 1 addition & 0 deletions ports/stm/st_driver/cmsis_device_g4
Open in desktop
Submodule cmsis_device_g4 added at 371d9e
1 change: 1 addition & 0 deletions ports/stm/st_driver/cmsis_device_h7
Open in desktop
Submodule cmsis_device_h7 added at f5e3a1
1 change: 1 addition & 0 deletions ports/stm/st_driver/cmsis_device_l0
Open in desktop
Submodule cmsis_device_l0 added at 532d96
1 change: 1 addition & 0 deletions ports/stm/st_driver/cmsis_device_l1
Open in desktop
Submodule cmsis_device_l1 added at 182733
1 change: 1 addition & 0 deletions ports/stm/st_driver/cmsis_device_l4
Open in desktop
Submodule cmsis_device_l4 added at aae7f4
1 change: 1 addition & 0 deletions ports/stm/st_driver/cmsis_device_l5
Open in desktop
Submodule cmsis_device_l5 added at fcf61c
1 change: 1 addition & 0 deletions ports/stm/st_driver/stm32f0xx_hal_driver
Open in desktop
Submodule stm32f0xx_hal_driver added at 79307a
1 change: 1 addition & 0 deletions ports/stm/st_driver/stm32f1xx_hal_driver
Open in desktop
Submodule stm32f1xx_hal_driver added at fccac4
1 change: 1 addition & 0 deletions ports/stm/st_driver/stm32f2xx_hal_driver
Open in desktop
Submodule stm32f2xx_hal_driver added at cc54dd
1 change: 1 addition & 0 deletions ports/stm/st_driver/stm32f3xx_hal_driver
Open in desktop
Submodule stm32f3xx_hal_driver added at 58a240
1 change: 1 addition & 0 deletions ports/stm/st_driver/stm32f4xx_hal_driver
Open in desktop
Submodule stm32f4xx_hal_driver added at abb4cd
1 change: 1 addition & 0 deletions ports/stm/st_driver/stm32f7xx_hal_driver
Open in desktop
Submodule stm32f7xx_hal_driver added at 27458e
1 change: 1 addition & 0 deletions ports/stm/st_driver/stm32g0xx_hal_driver
Open in desktop
Submodule stm32g0xx_hal_driver added at 36ae43
1 change: 1 addition & 0 deletions ports/stm/st_driver/stm32g4xx_hal_driver
Open in desktop
Submodule stm32g4xx_hal_driver added at 19bed7
1 change: 1 addition & 0 deletions ports/stm/st_driver/stm32h7xx_hal_driver
Open in desktop
Submodule stm32h7xx_hal_driver added at 2bfa1c
1 change: 1 addition & 0 deletions ports/stm/st_driver/stm32l0xx_hal_driver
Open in desktop
Submodule stm32l0xx_hal_driver added at ad9b9f
1 change: 1 addition & 0 deletions ports/stm/st_driver/stm32l1xx_hal_driver
Open in desktop
Submodule stm32l1xx_hal_driver added at 919c17
1 change: 1 addition & 0 deletions ports/stm/st_driver/stm32l4xx_hal_driver
Open in desktop
Submodule stm32l4xx_hal_driver added at 49aacb
1 change: 1 addition & 0 deletions ports/stm/st_driver/stm32l5xx_hal_driver
Open in desktop
Submodule stm32l5xx_hal_driver added at 4f8916