Skip to content

Commit 6af18dc

Browse files
hathachhathach
authored
Merge pull request hathach#1947 from hathach/remove-submodules
Remove submodules and use python script to manage repo dependencies
2 parents b5b2fad + 206a9a2 commit 6af18dc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+186
-244
lines changed

‎.github/workflows/build_aarch64.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
uses: actions/checkout@v3
4444

4545
- name: Checkout common submodules in lib
46-
run: git submodule update --init lib/FreeRTOS-Kernel lib/lwip lib/sct_neopixel
46+
run: git submodule update --init lib/FreeRTOS-Kernel lib/lwip
4747

4848
- name: Checkout hathach/linkermap
4949
uses: actions/checkout@v3
@@ -72,7 +72,7 @@ jobs:
7272
run: echo >> $GITHUB_PATH `echo ~/cache/toolchain/*/bin`
7373

7474
- name: Get Dependencies
75-
run: python3 tools/get_dependencies.py ${{ matrix.family }}
75+
run: python3 tools/get_family_deps.py ${{ matrix.family }}
7676

7777
- name: Build
7878
run: python3 tools/build_family.py ${{ matrix.family }}

‎.github/workflows/build_arm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
echo >> $GITHUB_ENV PICO_SDK_PATH=~/pico-sdk
8181
8282
- name: Get Dependencies
83-
run: python3 tools/get_dependencies.py ${{ matrix.family }}
83+
run: python3 tools/get_family_deps.py ${{ matrix.family }}
8484

8585
- name: Build
8686
run: python3 tools/build_family.py ${{ matrix.family }}

‎.github/workflows/build_iar.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,8 @@ jobs:
4444

4545
- name: Checkout submodules and dependencies
4646
run: |
47-
git submodule update --init lib/FreeRTOS-Kernel lib/lwip lib/sct_neopixel
48-
python3 tools/get_dependencies.py ${{ matrix.family }}
49-
50-
#- name: Checkout pico-sdk for rp2040
51-
# if: matrix.family == 'rp2040'
52-
# run: |
53-
# git clone --depth 1 -b develop https://github.com/raspberrypi/pico-sdk ~/pico-sdk
54-
# echo >> $GITHUB_ENV PICO_SDK_PATH=~/pico-sdk
47+
git submodule update --init lib/FreeRTOS-Kernel lib/lwip
48+
python3 tools/get_family_deps.py ${{ matrix.family }}
5549
5650
- name: Build
5751
run: python3 tools/build_family.py ${{ matrix.family }} CC=iccarm

‎.github/workflows/build_msp430.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
run: echo >> $GITHUB_PATH `echo ~/cache/toolchain/*/bin`
7171

7272
- name: Get Dependencies
73-
run: python3 tools/get_dependencies.py ${{ matrix.family }}
73+
run: python3 tools/get_family_deps.py ${{ matrix.family }}
7474

7575
- name: Build
7676
run: python3 tools/build_family.py ${{ matrix.family }}

‎.github/workflows/build_renesas.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
run: echo >> $GITHUB_PATH `echo ~/cache/toolchain/*/bin`
7171

7272
- name: Get Dependencies
73-
run: python3 tools/get_dependencies.py ${{ matrix.family }}
73+
run: python3 tools/get_family_deps.py ${{ matrix.family }}
7474

7575
- name: Build
7676
run: python3 tools/build_family.py ${{ matrix.family }}

‎.github/workflows/build_riscv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
run: echo >> $GITHUB_PATH `echo ~/cache/toolchain/*/bin`
7272

7373
- name: Get Dependencies
74-
run: python3 tools/get_dependencies.py ${{ matrix.family }}
74+
run: python3 tools/get_family_deps.py ${{ matrix.family }}
7575

7676
- name: Build
7777
run: python3 tools/build_family.py ${{ matrix.family }}

‎.github/workflows/build_win_mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
run: git submodule update --init lib/FreeRTOS-Kernel lib/lwip
5151

5252
- name: Get Dependencies
53-
run: python3 tools/get_dependencies.py stm32f4
53+
run: python3 tools/get_family_deps.py stm32f4
5454

5555
- name: Build
5656
run: python3 tools/build_family.py stm32f4 stm32f411disco

‎.gitignore

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,57 @@ cov-int
2828
/_bin/
2929
__pycache__
3030

31+
# submodules
32+
hw/mcu/allwinner
33+
hw/mcu/bridgetek/ft9xx/ft90x-sdk
34+
hw/mcu/broadcom
35+
hw/mcu/gd/nuclei-sdk
36+
hw/mcu/infineon/mtb-xmclib-cat3
37+
hw/mcu/microchip
38+
hw/mcu/mindmotion/mm32sdk
39+
hw/mcu/nordic/nrfx
40+
hw/mcu/nuvoton
41+
hw/mcu/nxp/lpcopen
42+
hw/mcu/nxp/mcux-sdk
43+
hw/mcu/nxp/nxp_sdk
44+
hw/mcu/raspberry_pi/Pico-PIO-USB
45+
hw/mcu/renesas/rx
46+
hw/mcu/silabs/cmsis-dfp-efm32gg12b
47+
hw/mcu/sony/cxd56/spresense-exported-sdk
48+
hw/mcu/st/cmsis_device_f0
49+
hw/mcu/st/cmsis_device_f1
50+
hw/mcu/st/cmsis_device_f2
51+
hw/mcu/st/cmsis_device_f3
52+
hw/mcu/st/cmsis_device_f4
53+
hw/mcu/st/cmsis_device_f7
54+
hw/mcu/st/cmsis_device_g0
55+
hw/mcu/st/cmsis_device_g4
56+
hw/mcu/st/cmsis_device_h7
57+
hw/mcu/st/cmsis_device_l0
58+
hw/mcu/st/cmsis_device_l1
59+
hw/mcu/st/cmsis_device_l4
60+
hw/mcu/st/cmsis_device_l5
61+
hw/mcu/st/cmsis_device_u5
62+
hw/mcu/st/cmsis_device_wb
63+
hw/mcu/st/stm32f0xx_hal_driver
64+
hw/mcu/st/stm32f1xx_hal_driver
65+
hw/mcu/st/stm32f2xx_hal_driver
66+
hw/mcu/st/stm32f3xx_hal_driver
67+
hw/mcu/st/stm32f4xx_hal_driver
68+
hw/mcu/st/stm32f7xx_hal_driver
69+
hw/mcu/st/stm32g0xx_hal_driver
70+
hw/mcu/st/stm32g4xx_hal_driver
71+
hw/mcu/st/stm32h7xx_hal_driver
72+
hw/mcu/st/stm32l0xx_hal_driver
73+
hw/mcu/st/stm32l1xx_hal_driver
74+
hw/mcu/st/stm32l4xx_hal_driver
75+
hw/mcu/st/stm32l5xx_hal_driver
76+
hw/mcu/st/stm32u5xx_hal_driver
77+
hw/mcu/st/stm32wbxx_hal_driver
78+
hw/mcu/ti
79+
hw/mcu/wch/ch32v307
80+
lib/CMSIS_5
81+
lib/FreeRTOS-Kernel
82+
lib/lwip
83+
lib/sct_neopixel
84+
tools/uf2

‎.gitmodules

Lines changed: 0 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -1,160 +1,9 @@
1-
[submodule "hw/mcu/nordic/nrfx"]
2-
path = hw/mcu/nordic/nrfx
3-
url = https://github.com/NordicSemiconductor/nrfx.git
41
[submodule "tools/uf2"]
52
path = tools/uf2
63
url = https://github.com/microsoft/uf2.git
7-
[submodule "hw/mcu/sony/cxd56/spresense-exported-sdk"]
8-
path = hw/mcu/sony/cxd56/spresense-exported-sdk
9-
url = https://github.com/sonydevworld/spresense-exported-sdk.git
10-
[submodule "hw/mcu/ti"]
11-
path = hw/mcu/ti
12-
url = https://github.com/hathach/ti_driver.git
13-
[submodule "hw/mcu/microchip"]
14-
path = hw/mcu/microchip
15-
url = https://github.com/hathach/microchip_driver.git
16-
[submodule "hw/mcu/nuvoton"]
17-
path = hw/mcu/nuvoton
18-
url = https://github.com/majbthrd/nuc_driver.git
194
[submodule "lib/lwip"]
205
path = lib/lwip
216
url = https://github.com/lwip-tcpip/lwip.git
22-
[submodule "hw/mcu/st/cmsis_device_f4"]
23-
path = hw/mcu/st/cmsis_device_f4
24-
url = https://github.com/STMicroelectronics/cmsis_device_f4.git
25-
[submodule "hw/mcu/st/stm32f4xx_hal_driver"]
26-
path = hw/mcu/st/stm32f4xx_hal_driver
27-
url = https://github.com/STMicroelectronics/stm32f4xx_hal_driver.git
28-
[submodule "hw/mcu/st/cmsis_device_f0"]
29-
path = hw/mcu/st/cmsis_device_f0
30-
url = https://github.com/STMicroelectronics/cmsis_device_f0.git
31-
[submodule "hw/mcu/st/stm32f0xx_hal_driver"]
32-
path = hw/mcu/st/stm32f0xx_hal_driver
33-
url = https://github.com/STMicroelectronics/stm32f0xx_hal_driver.git
34-
[submodule "hw/mcu/st/cmsis_device_f1"]
35-
path = hw/mcu/st/cmsis_device_f1
36-
url = https://github.com/STMicroelectronics/cmsis_device_f1.git
37-
[submodule "hw/mcu/st/stm32f1xx_hal_driver"]
38-
path = hw/mcu/st/stm32f1xx_hal_driver
39-
url = https://github.com/STMicroelectronics/stm32f1xx_hal_driver.git
40-
[submodule "hw/mcu/st/cmsis_device_f2"]
41-
path = hw/mcu/st/cmsis_device_f2
42-
url = https://github.com/STMicroelectronics/cmsis_device_f2.git
43-
[submodule "hw/mcu/st/stm32f2xx_hal_driver"]
44-
path = hw/mcu/st/stm32f2xx_hal_driver
45-
url = https://github.com/STMicroelectronics/stm32f2xx_hal_driver.git
46-
[submodule "hw/mcu/st/cmsis_device_f3"]
47-
path = hw/mcu/st/cmsis_device_f3
48-
url = https://github.com/STMicroelectronics/cmsis_device_f3.git
49-
[submodule "hw/mcu/st/stm32f3xx_hal_driver"]
50-
path = hw/mcu/st/stm32f3xx_hal_driver
51-
url = https://github.com/STMicroelectronics/stm32f3xx_hal_driver.git
52-
[submodule "hw/mcu/st/cmsis_device_f7"]
53-
path = hw/mcu/st/cmsis_device_f7
54-
url = https://github.com/STMicroelectronics/cmsis_device_f7.git
55-
[submodule "hw/mcu/st/stm32f7xx_hal_driver"]
56-
path = hw/mcu/st/stm32f7xx_hal_driver
57-
url = https://github.com/STMicroelectronics/stm32f7xx_hal_driver.git
58-
[submodule "hw/mcu/st/cmsis_device_h7"]
59-
path = hw/mcu/st/cmsis_device_h7
60-
url = https://github.com/STMicroelectronics/cmsis_device_h7.git
61-
[submodule "hw/mcu/st/stm32h7xx_hal_driver"]
62-
path = hw/mcu/st/stm32h7xx_hal_driver
63-
url = https://github.com/STMicroelectronics/stm32h7xx_hal_driver.git
64-
[submodule "hw/mcu/st/cmsis_device_l0"]
65-
path = hw/mcu/st/cmsis_device_l0
66-
url = https://github.com/STMicroelectronics/cmsis_device_l0.git
67-
[submodule "hw/mcu/st/stm32l0xx_hal_driver"]
68-
path = hw/mcu/st/stm32l0xx_hal_driver
69-
url = https://github.com/STMicroelectronics/stm32l0xx_hal_driver.git
70-
[submodule "hw/mcu/st/cmsis_device_l1"]
71-
path = hw/mcu/st/cmsis_device_l1
72-
url = https://github.com/STMicroelectronics/cmsis_device_l1.git
73-
[submodule "hw/mcu/st/stm32l1xx_hal_driver"]
74-
path = hw/mcu/st/stm32l1xx_hal_driver
75-
url = https://github.com/STMicroelectronics/stm32l1xx_hal_driver.git
76-
[submodule "hw/mcu/st/cmsis_device_l4"]
77-
path = hw/mcu/st/cmsis_device_l4
78-
url = https://github.com/STMicroelectronics/cmsis_device_l4.git
79-
[submodule "hw/mcu/st/stm32l4xx_hal_driver"]
80-
path = hw/mcu/st/stm32l4xx_hal_driver
81-
url = https://github.com/STMicroelectronics/stm32l4xx_hal_driver.git
82-
[submodule "hw/mcu/st/cmsis_device_g0"]
83-
path = hw/mcu/st/cmsis_device_g0
84-
url = https://github.com/STMicroelectronics/cmsis_device_g0.git
85-
[submodule "hw/mcu/st/stm32g0xx_hal_driver"]
86-
path = hw/mcu/st/stm32g0xx_hal_driver
87-
url = https://github.com/STMicroelectronics/stm32g0xx_hal_driver.git
88-
[submodule "hw/mcu/st/cmsis_device_g4"]
89-
path = hw/mcu/st/cmsis_device_g4
90-
url = https://github.com/STMicroelectronics/cmsis_device_g4.git
91-
[submodule "hw/mcu/st/stm32g4xx_hal_driver"]
92-
path = hw/mcu/st/stm32g4xx_hal_driver
93-
url = https://github.com/STMicroelectronics/stm32g4xx_hal_driver.git
94-
[submodule "hw/mcu/st/cmsis_device_l5"]
95-
path = hw/mcu/st/cmsis_device_l5
96-
url = https://github.com/STMicroelectronics/cmsis_device_l5.git
97-
[submodule "hw/mcu/st/stm32l5xx_hal_driver"]
98-
path = hw/mcu/st/stm32l5xx_hal_driver
99-
url = https://github.com/STMicroelectronics/stm32l5xx_hal_driver.git
100-
[submodule "hw/mcu/st/cmsis_device_wb"]
101-
path = hw/mcu/st/cmsis_device_wb
102-
url = https://github.com/STMicroelectronics/cmsis_device_wb.git
103-
[submodule "hw/mcu/st/stm32wbxx_hal_driver"]
104-
path = hw/mcu/st/stm32wbxx_hal_driver
105-
url = https://github.com/STMicroelectronics/stm32wbxx_hal_driver.git
106-
[submodule "lib/sct_neopixel"]
107-
path = lib/sct_neopixel
108-
url = https://github.com/gsteiert/sct_neopixel
1097
[submodule "lib/FreeRTOS-Kernel"]
1108
path = lib/FreeRTOS-Kernel
1119
url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
112-
[submodule "lib/CMSIS_5"]
113-
path = lib/CMSIS_5
114-
url = https://github.com/ARM-software/CMSIS_5.git
115-
[submodule "hw/mcu/silabs/cmsis-dfp-efm32gg12b"]
116-
path = hw/mcu/silabs/cmsis-dfp-efm32gg12b
117-
url = https://github.com/cmsis-packs/cmsis-dfp-efm32gg12b
118-
[submodule "hw/mcu/renesas/rx"]
119-
path = hw/mcu/renesas/rx
120-
url = https://github.com/kkitayam/rx_device.git
121-
[submodule "hw/mcu/nxp/lpcopen"]
122-
path = hw/mcu/nxp/lpcopen
123-
url = https://github.com/hathach/nxp_lpcopen.git
124-
[submodule "hw/mcu/nxp/mcux-sdk"]
125-
path = hw/mcu/nxp/mcux-sdk
126-
url = https://github.com/NXPmicro/mcux-sdk.git
127-
[submodule "hw/mcu/nxp/nxp_sdk"]
128-
path = hw/mcu/nxp/nxp_sdk
129-
url = https://github.com/hathach/nxp_sdk.git
130-
[submodule "hw/mcu/gd/nuclei-sdk"]
131-
path = hw/mcu/gd/nuclei-sdk
132-
url = https://github.com/Nuclei-Software/nuclei-sdk.git
133-
[submodule "hw/mcu/bridgetek/ft9xx/ft90x-sdk"]
134-
path = hw/mcu/bridgetek/ft9xx/ft90x-sdk
135-
url = https://github.com/BRTSG-FOSS/ft90x-sdk
136-
[submodule "hw/mcu/mindmotion/mm32sdk"]
137-
path = hw/mcu/mindmotion/mm32sdk
138-
url = https://github.com/hathach/mm32sdk.git
139-
[submodule "hw/mcu/broadcom"]
140-
path = hw/mcu/broadcom
141-
url = https://github.com/adafruit/broadcom-peripherals.git
142-
branch = main-build
143-
[submodule "hw/mcu/infineon/mtb-xmclib-cat3"]
144-
path = hw/mcu/infineon/mtb-xmclib-cat3
145-
url = https://github.com/Infineon/mtb-xmclib-cat3.git
146-
[submodule "hw/mcu/allwinner"]
147-
path = hw/mcu/allwinner
148-
url = https://github.com/hathach/allwinner_driver.git
149-
[submodule "hw/mcu/wch/ch32v307"]
150-
path = hw/mcu/wch/ch32v307
151-
url = https://github.com/openwch/ch32v307.git
152-
[submodule "hw/mcu/raspberry_pi/Pico-PIO-USB"]
153-
path = hw/mcu/raspberry_pi/Pico-PIO-USB
154-
url = https://github.com/sekigon-gonnoc/Pico-PIO-USB.git
155-
[submodule "hw/mcu/st/cmsis_device_u5"]
156-
path = hw/mcu/st/cmsis_device_u5
157-
url = https://github.com/STMicroelectronics/cmsis_device_u5
158-
[submodule "hw/mcu/st/stm32u5xx_hal_driver"]
159-
path = hw/mcu/st/stm32u5xx_hal_driver
160-
url = https://github.com/STMicroelectronics/stm32u5xx_hal_driver

‎examples/rules.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ endif
193193
.PHONY: get-deps
194194
get-deps:
195195
ifdef DEPS_SUBMODULES
196-
git -C $(TOP) submodule update --init $(DEPS_SUBMODULES)
196+
$(PYTHON) $(TOP)/tools/get_deps.py $(DEPS_SUBMODULES)
197197
endif
198198

199199
.PHONY: size

0 commit comments

Comments
 (0)