From 92c9be9a4f7a1e3ed7c666823e0fe127c799d625 Mon Sep 17 00:00:00 2001 From: Scott Gauche Date: Wed, 2 Feb 2022 21:30:23 -0500 Subject: [PATCH] change st_driver to use ST's github drivers as submodules --- .gitmodules | 81 ++++++++++++++++++++++++ ports/stm/Makefile | 8 +-- ports/stm/st_driver/CMSIS_5 | 1 + ports/stm/st_driver/cmsis_device_f0 | 1 + ports/stm/st_driver/cmsis_device_f1 | 1 + ports/stm/st_driver/cmsis_device_f2 | 1 + ports/stm/st_driver/cmsis_device_f3 | 1 + ports/stm/st_driver/cmsis_device_f4 | 1 + ports/stm/st_driver/cmsis_device_f7 | 1 + ports/stm/st_driver/cmsis_device_g0 | 1 + ports/stm/st_driver/cmsis_device_g4 | 1 + ports/stm/st_driver/cmsis_device_h7 | 1 + ports/stm/st_driver/cmsis_device_l0 | 1 + ports/stm/st_driver/cmsis_device_l1 | 1 + ports/stm/st_driver/cmsis_device_l4 | 1 + ports/stm/st_driver/cmsis_device_l5 | 1 + ports/stm/st_driver/stm32f0xx_hal_driver | 1 + ports/stm/st_driver/stm32f1xx_hal_driver | 1 + ports/stm/st_driver/stm32f2xx_hal_driver | 1 + ports/stm/st_driver/stm32f3xx_hal_driver | 1 + ports/stm/st_driver/stm32f4xx_hal_driver | 1 + ports/stm/st_driver/stm32f7xx_hal_driver | 1 + ports/stm/st_driver/stm32g0xx_hal_driver | 1 + ports/stm/st_driver/stm32g4xx_hal_driver | 1 + ports/stm/st_driver/stm32h7xx_hal_driver | 1 + ports/stm/st_driver/stm32l0xx_hal_driver | 1 + ports/stm/st_driver/stm32l1xx_hal_driver | 1 + ports/stm/st_driver/stm32l4xx_hal_driver | 1 + ports/stm/st_driver/stm32l5xx_hal_driver | 1 + 29 files changed, 112 insertions(+), 4 deletions(-) create mode 160000 ports/stm/st_driver/CMSIS_5 create mode 160000 ports/stm/st_driver/cmsis_device_f0 create mode 160000 ports/stm/st_driver/cmsis_device_f1 create mode 160000 ports/stm/st_driver/cmsis_device_f2 create mode 160000 ports/stm/st_driver/cmsis_device_f3 create mode 160000 ports/stm/st_driver/cmsis_device_f4 create mode 160000 ports/stm/st_driver/cmsis_device_f7 create mode 160000 ports/stm/st_driver/cmsis_device_g0 create mode 160000 ports/stm/st_driver/cmsis_device_g4 create mode 160000 ports/stm/st_driver/cmsis_device_h7 create mode 160000 ports/stm/st_driver/cmsis_device_l0 create mode 160000 ports/stm/st_driver/cmsis_device_l1 create mode 160000 ports/stm/st_driver/cmsis_device_l4 create mode 160000 ports/stm/st_driver/cmsis_device_l5 create mode 160000 ports/stm/st_driver/stm32f0xx_hal_driver create mode 160000 ports/stm/st_driver/stm32f1xx_hal_driver create mode 160000 ports/stm/st_driver/stm32f2xx_hal_driver create mode 160000 ports/stm/st_driver/stm32f3xx_hal_driver create mode 160000 ports/stm/st_driver/stm32f4xx_hal_driver create mode 160000 ports/stm/st_driver/stm32f7xx_hal_driver create mode 160000 ports/stm/st_driver/stm32g0xx_hal_driver create mode 160000 ports/stm/st_driver/stm32g4xx_hal_driver create mode 160000 ports/stm/st_driver/stm32h7xx_hal_driver create mode 160000 ports/stm/st_driver/stm32l0xx_hal_driver create mode 160000 ports/stm/st_driver/stm32l1xx_hal_driver create mode 160000 ports/stm/st_driver/stm32l4xx_hal_driver create mode 160000 ports/stm/st_driver/stm32l5xx_hal_driver diff --git a/.gitmodules b/.gitmodules index 893a9e7df6..870938b366 100644 --- a/.gitmodules +++ b/.gitmodules @@ -196,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/stm32f4xx_hal_driver"] + path = ports/stm/st_driver/stm32f4xx_hal_driver + url = https://github.com/STMicroelectronics/stm32f4xx_hal_driver.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 diff --git a/ports/stm/Makefile b/ports/stm/Makefile index b5423b62c0..48b0000a65 100755 --- a/ports/stm/Makefile +++ b/ports/stm/Makefile @@ -60,7 +60,7 @@ 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../.. @@ -68,8 +68,8 @@ 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 @@ -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)) \ diff --git a/ports/stm/st_driver/CMSIS_5 b/ports/stm/st_driver/CMSIS_5 new file mode 160000 index 0000000000..0b52176506 --- /dev/null +++ b/ports/stm/st_driver/CMSIS_5 @@ -0,0 +1 @@ +Subproject commit 0b521765067ac87b142cd96b5f578ffb399090cc diff --git a/ports/stm/st_driver/cmsis_device_f0 b/ports/stm/st_driver/cmsis_device_f0 new file mode 160000 index 0000000000..8b86197c7a --- /dev/null +++ b/ports/stm/st_driver/cmsis_device_f0 @@ -0,0 +1 @@ +Subproject commit 8b86197c7ab77ad029c34dc73cf6d4a1e12327d8 diff --git a/ports/stm/st_driver/cmsis_device_f1 b/ports/stm/st_driver/cmsis_device_f1 new file mode 160000 index 0000000000..71ad5b3bf5 --- /dev/null +++ b/ports/stm/st_driver/cmsis_device_f1 @@ -0,0 +1 @@ +Subproject commit 71ad5b3bf5cbb4d35cf8c8726c1b343871f0df0a diff --git a/ports/stm/st_driver/cmsis_device_f2 b/ports/stm/st_driver/cmsis_device_f2 new file mode 160000 index 0000000000..694c49f696 --- /dev/null +++ b/ports/stm/st_driver/cmsis_device_f2 @@ -0,0 +1 @@ +Subproject commit 694c49f696d359f57f23153ab7acf3ac1a43f663 diff --git a/ports/stm/st_driver/cmsis_device_f3 b/ports/stm/st_driver/cmsis_device_f3 new file mode 160000 index 0000000000..167eefd811 --- /dev/null +++ b/ports/stm/st_driver/cmsis_device_f3 @@ -0,0 +1 @@ +Subproject commit 167eefd811de90a58c41e0a32071cdfecede389a diff --git a/ports/stm/st_driver/cmsis_device_f4 b/ports/stm/st_driver/cmsis_device_f4 new file mode 160000 index 0000000000..6fe2c1f498 --- /dev/null +++ b/ports/stm/st_driver/cmsis_device_f4 @@ -0,0 +1 @@ +Subproject commit 6fe2c1f498feda34ee422720ff8b3bd1b4656145 diff --git a/ports/stm/st_driver/cmsis_device_f7 b/ports/stm/st_driver/cmsis_device_f7 new file mode 160000 index 0000000000..d29a89278d --- /dev/null +++ b/ports/stm/st_driver/cmsis_device_f7 @@ -0,0 +1 @@ +Subproject commit d29a89278dad0b89124c008be647f681d5253be4 diff --git a/ports/stm/st_driver/cmsis_device_g0 b/ports/stm/st_driver/cmsis_device_g0 new file mode 160000 index 0000000000..4daf765de5 --- /dev/null +++ b/ports/stm/st_driver/cmsis_device_g0 @@ -0,0 +1 @@ +Subproject commit 4daf765de5c5956df1bb27139e624b5deba270c9 diff --git a/ports/stm/st_driver/cmsis_device_g4 b/ports/stm/st_driver/cmsis_device_g4 new file mode 160000 index 0000000000..371d9ecec9 --- /dev/null +++ b/ports/stm/st_driver/cmsis_device_g4 @@ -0,0 +1 @@ +Subproject commit 371d9ecec9acc4d8b4baad36c8dc60cb9895baf7 diff --git a/ports/stm/st_driver/cmsis_device_h7 b/ports/stm/st_driver/cmsis_device_h7 new file mode 160000 index 0000000000..f5e3a1d5e7 --- /dev/null +++ b/ports/stm/st_driver/cmsis_device_h7 @@ -0,0 +1 @@ +Subproject commit f5e3a1d5e71e6b9278a6d580b7d5ca82c0debd9b diff --git a/ports/stm/st_driver/cmsis_device_l0 b/ports/stm/st_driver/cmsis_device_l0 new file mode 160000 index 0000000000..532d96973e --- /dev/null +++ b/ports/stm/st_driver/cmsis_device_l0 @@ -0,0 +1 @@ +Subproject commit 532d96973e7b2ae5546a2c88cb216429f74f5f5d diff --git a/ports/stm/st_driver/cmsis_device_l1 b/ports/stm/st_driver/cmsis_device_l1 new file mode 160000 index 0000000000..1827333a7f --- /dev/null +++ b/ports/stm/st_driver/cmsis_device_l1 @@ -0,0 +1 @@ +Subproject commit 1827333a7f7822282a6a46e4169596b5fb58cf61 diff --git a/ports/stm/st_driver/cmsis_device_l4 b/ports/stm/st_driver/cmsis_device_l4 new file mode 160000 index 0000000000..aae7f48733 --- /dev/null +++ b/ports/stm/st_driver/cmsis_device_l4 @@ -0,0 +1 @@ +Subproject commit aae7f4873380f77091ef62c461dc7a617b649d8e diff --git a/ports/stm/st_driver/cmsis_device_l5 b/ports/stm/st_driver/cmsis_device_l5 new file mode 160000 index 0000000000..fcf61cd086 --- /dev/null +++ b/ports/stm/st_driver/cmsis_device_l5 @@ -0,0 +1 @@ +Subproject commit fcf61cd086e02c7a1cf7535ffe30622d1f5d36aa diff --git a/ports/stm/st_driver/stm32f0xx_hal_driver b/ports/stm/st_driver/stm32f0xx_hal_driver new file mode 160000 index 0000000000..79307a2f62 --- /dev/null +++ b/ports/stm/st_driver/stm32f0xx_hal_driver @@ -0,0 +1 @@ +Subproject commit 79307a2f629b5959e67656564a8436e0a21e93d0 diff --git a/ports/stm/st_driver/stm32f1xx_hal_driver b/ports/stm/st_driver/stm32f1xx_hal_driver new file mode 160000 index 0000000000..fccac44e18 --- /dev/null +++ b/ports/stm/st_driver/stm32f1xx_hal_driver @@ -0,0 +1 @@ +Subproject commit fccac44e1859e1ad1a38353b46c9ed7587bdb4be diff --git a/ports/stm/st_driver/stm32f2xx_hal_driver b/ports/stm/st_driver/stm32f2xx_hal_driver new file mode 160000 index 0000000000..cc54dd7a90 --- /dev/null +++ b/ports/stm/st_driver/stm32f2xx_hal_driver @@ -0,0 +1 @@ +Subproject commit cc54dd7a903220618b0487970b087f4e34973d1d diff --git a/ports/stm/st_driver/stm32f3xx_hal_driver b/ports/stm/st_driver/stm32f3xx_hal_driver new file mode 160000 index 0000000000..58a240b306 --- /dev/null +++ b/ports/stm/st_driver/stm32f3xx_hal_driver @@ -0,0 +1 @@ +Subproject commit 58a240b30676cb51ee0e09347c6b55a9fc4f7140 diff --git a/ports/stm/st_driver/stm32f4xx_hal_driver b/ports/stm/st_driver/stm32f4xx_hal_driver new file mode 160000 index 0000000000..c91c4a744c --- /dev/null +++ b/ports/stm/st_driver/stm32f4xx_hal_driver @@ -0,0 +1 @@ +Subproject commit c91c4a744c5bcf881c5172a4f064bbc5eb7a5e39 diff --git a/ports/stm/st_driver/stm32f7xx_hal_driver b/ports/stm/st_driver/stm32f7xx_hal_driver new file mode 160000 index 0000000000..27458ea876 --- /dev/null +++ b/ports/stm/st_driver/stm32f7xx_hal_driver @@ -0,0 +1 @@ +Subproject commit 27458ea876aabd8fd568c5e2a8a3448f082e2817 diff --git a/ports/stm/st_driver/stm32g0xx_hal_driver b/ports/stm/st_driver/stm32g0xx_hal_driver new file mode 160000 index 0000000000..36ae439581 --- /dev/null +++ b/ports/stm/st_driver/stm32g0xx_hal_driver @@ -0,0 +1 @@ +Subproject commit 36ae43958161cff572db2f88378e81895ec3a337 diff --git a/ports/stm/st_driver/stm32g4xx_hal_driver b/ports/stm/st_driver/stm32g4xx_hal_driver new file mode 160000 index 0000000000..19bed7c9f8 --- /dev/null +++ b/ports/stm/st_driver/stm32g4xx_hal_driver @@ -0,0 +1 @@ +Subproject commit 19bed7c9f84aa74aba98c6d1ea54bed39bd8e61a diff --git a/ports/stm/st_driver/stm32h7xx_hal_driver b/ports/stm/st_driver/stm32h7xx_hal_driver new file mode 160000 index 0000000000..2bfa1cae79 --- /dev/null +++ b/ports/stm/st_driver/stm32h7xx_hal_driver @@ -0,0 +1 @@ +Subproject commit 2bfa1cae79926af47ff79a48757d29a38c9c8978 diff --git a/ports/stm/st_driver/stm32l0xx_hal_driver b/ports/stm/st_driver/stm32l0xx_hal_driver new file mode 160000 index 0000000000..ad9b9fbceb --- /dev/null +++ b/ports/stm/st_driver/stm32l0xx_hal_driver @@ -0,0 +1 @@ +Subproject commit ad9b9fbceb1427078000476dd4cd926603fd5b89 diff --git a/ports/stm/st_driver/stm32l1xx_hal_driver b/ports/stm/st_driver/stm32l1xx_hal_driver new file mode 160000 index 0000000000..919c1714f0 --- /dev/null +++ b/ports/stm/st_driver/stm32l1xx_hal_driver @@ -0,0 +1 @@ +Subproject commit 919c1714f0e605c96e312675d8a14c421881d2ec diff --git a/ports/stm/st_driver/stm32l4xx_hal_driver b/ports/stm/st_driver/stm32l4xx_hal_driver new file mode 160000 index 0000000000..49aacb861d --- /dev/null +++ b/ports/stm/st_driver/stm32l4xx_hal_driver @@ -0,0 +1 @@ +Subproject commit 49aacb861d9f2b4c43238989e7ba19d82c230641 diff --git a/ports/stm/st_driver/stm32l5xx_hal_driver b/ports/stm/st_driver/stm32l5xx_hal_driver new file mode 160000 index 0000000000..4f89168f73 --- /dev/null +++ b/ports/stm/st_driver/stm32l5xx_hal_driver @@ -0,0 +1 @@ +Subproject commit 4f89168f731596308eae3770a63518413f34cf3d