Merge pull request #702 from hathach/more-ci

More ci

47 files changed, 116 insertions, 67 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ce6a05a76..1263ef1c1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -278,24 +278,12 @@ jobs:
       fail-fast: false
       matrix:
         example:
-        # Alphabetical order
-        - 'device/audio_test'
-        - 'device/board_test'
-        - 'device/cdc_dual_ports'
-        - 'device/cdc_msc'
-        - 'device/cdc_msc_freertos'
-        - 'device/dfu_runtime'
-        - 'device/hid_composite'
-        - 'device/hid_composite_freertos'
-        - 'device/hid_generic_inout'
-        - 'device/hid_multiple_interface'
-        - 'device/midi_test'
-        - 'device/msc_dual_lun'
+        # Alphabetical order, a group of 4
+        - 'device/audio_test device/board_test device/cdc_dual_ports device/cdc_msc'
+        - 'device/cdc_msc_freertos device/dfu_runtime device/hid_composite device/hid_composite_freertos'
+        - 'device/hid_generic_inout device/hid_multiple_interface device/midi_test device/msc_dual_lun'
         - 'device/net_lwip_webserver'
-        - 'device/uac2_headset'
-        - 'device/usbtmc'
-        - 'device/webusb_serial'
-        - 'host/cdc_msc_hid'
+        - 'device/uac2_headset device/usbtmc device/webusb_serial host/cdc_msc_hid'
 
     steps:
     - name: Setup Python
@@ -303,8 +291,9 @@ jobs:
 
     - name: Checkout TinyUSB
       uses: actions/checkout@v2
-      with:
-        submodules: 'true'
+
+    - name: Checkout Submodules in lib
+      run: git submodule update --init lib
 
     - name: Set Toolchain URL
       run: echo >> $GITHUB_ENV TOOLCHAIN_URL=https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v10.2.1-1.1/xpack-arm-none-eabi-gcc-10.2.1-1.1-linux-x64.tar.gz
diff --git a/examples/make.mk b/examples/make.mk
index b29d0e4a2..82fbd020b 100644
--- a/examples/make.mk
+++ b/examples/make.mk
@@ -53,8 +53,8 @@ fetch_submodule_if_empty = \
     $(info $(shell git -C $(TOP) submodule update --init $1)) \
   endif
 
-ifdef FAMILY_SUBMODULES
-  $(foreach s,$(FAMILY_SUBMODULES),:$(call fetch_submodule_if_empty,$(s)))
+ifdef DEPS_SUBMODULES
+  $(foreach s,$(DEPS_SUBMODULES),:$(call fetch_submodule_if_empty,$(s)))
 endif
 
 #-------------- Cross Compiler  ------------
diff --git a/examples/rules.mk b/examples/rules.mk
index 561494c6d..a97eb566a 100644
--- a/examples/rules.mk
+++ b/examples/rules.mk
@@ -63,6 +63,7 @@ all: $(BUILD)
 clean:
 	$(RM) -rf $(BUILD)
 
+#flash: flash-pyocd
 flash:
 	@$(CP) $(BUILD)/$(PROJECT).uf2 /media/$(USER)/RPI-RP2
 
diff --git a/hw/bsp/d5035_01/board.mk b/hw/bsp/d5035_01/board.mk
index 3340f79e9..dc364a70c 100644
--- a/hw/bsp/d5035_01/board.mk
+++ b/hw/bsp/d5035_01/board.mk
@@ -1,3 +1,4 @@
+DEPS_SUBMODULES = hw/mcu/microchip
 HWREV ?= 1
 
 CFLAGS += \
diff --git a/hw/bsp/da14695_dk_usb/board.mk b/hw/bsp/da14695_dk_usb/board.mk
index 2e76012d2..58f3947cc 100644
--- a/hw/bsp/da14695_dk_usb/board.mk
+++ b/hw/bsp/da14695_dk_usb/board.mk
@@ -1,4 +1,4 @@
- CFLAGS += \
+CFLAGS += \
   -flto \
   -mthumb \
   -mthumb-interwork \
diff --git a/hw/bsp/da1469x_dk_pro/board.mk b/hw/bsp/da1469x_dk_pro/board.mk
index 52064e63c..5362498ea 100644
--- a/hw/bsp/da1469x_dk_pro/board.mk
+++ b/hw/bsp/da1469x_dk_pro/board.mk
@@ -1,4 +1,4 @@
- CFLAGS += \
+CFLAGS += \
   -flto \
   -mthumb \
   -mthumb-interwork \
diff --git a/hw/bsp/ea4088qs/board.mk b/hw/bsp/ea4088qs/board.mk
index 15e0bfb86..51e5babe8 100644
--- a/hw/bsp/ea4088qs/board.mk
+++ b/hw/bsp/ea4088qs/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/ea4357/board.mk b/hw/bsp/ea4357/board.mk
index f6c42e0cf..09c782cac 100644
--- a/hw/bsp/ea4357/board.mk
+++ b/hw/bsp/ea4357/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/frdm_kl25z/board.mk b/hw/bsp/frdm_kl25z/board.mk
index 9d86c4542..5ad4d2052 100644
--- a/hw/bsp/frdm_kl25z/board.mk
+++ b/hw/bsp/frdm_kl25z/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -mthumb \
   -mabi=aapcs \
diff --git a/hw/bsp/imxrt/family.mk b/hw/bsp/imxrt/family.mk
index 91298d400..c07e68d2b 100644
--- a/hw/bsp/imxrt/family.mk
+++ b/hw/bsp/imxrt/family.mk
@@ -1,5 +1,5 @@
 UF2_FAMILY_ID = 0x4fb2d5bd
-FAMILY_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES = hw/mcu/nxp
 
 include $(TOP)/$(BOARD_PATH)/board.mk
 
diff --git a/hw/bsp/lpc18/family.mk b/hw/bsp/lpc18/family.mk
index c9c4ce83a..05ff27c38 100644
--- a/hw/bsp/lpc18/family.mk
+++ b/hw/bsp/lpc18/family.mk
@@ -1,4 +1,4 @@
-FAMILY_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES = hw/mcu/nxp
 
 include $(TOP)/$(BOARD_PATH)/board.mk
 
diff --git a/hw/bsp/lpc55/family.mk b/hw/bsp/lpc55/family.mk
index d7bb444db..299975fb5 100644
--- a/hw/bsp/lpc55/family.mk
+++ b/hw/bsp/lpc55/family.mk
@@ -1,5 +1,5 @@
 UF2_FAMILY_ID = 0x2abc77ec
-FAMILY_SUBMODULES = hw/mcu/nxp
+DEPS_SUBMODULES = hw/mcu/nxp
 
 include $(TOP)/$(BOARD_PATH)/board.mk
 
diff --git a/hw/bsp/lpcxpresso11u37/board.mk b/hw/bsp/lpcxpresso11u37/board.mk
index 441e5215d..e1338c9a3 100644
--- a/hw/bsp/lpcxpresso11u37/board.mk
+++ b/hw/bsp/lpcxpresso11u37/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/lpcxpresso11u68/board.mk b/hw/bsp/lpcxpresso11u68/board.mk
index 53d809cfc..e038a9cd9 100644
--- a/hw/bsp/lpcxpresso11u68/board.mk
+++ b/hw/bsp/lpcxpresso11u68/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/lpcxpresso1347/board.mk b/hw/bsp/lpcxpresso1347/board.mk
index 915834ddf..277282b9c 100644
--- a/hw/bsp/lpcxpresso1347/board.mk
+++ b/hw/bsp/lpcxpresso1347/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/lpcxpresso1549/board.mk b/hw/bsp/lpcxpresso1549/board.mk
index 27c3ca8d6..8d98379dc 100644
--- a/hw/bsp/lpcxpresso1549/board.mk
+++ b/hw/bsp/lpcxpresso1549/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/lpcxpresso1769/board.mk b/hw/bsp/lpcxpresso1769/board.mk
index 11da5f722..4b77ac0c3 100644
--- a/hw/bsp/lpcxpresso1769/board.mk
+++ b/hw/bsp/lpcxpresso1769/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/lpcxpresso51u68/board.mk b/hw/bsp/lpcxpresso51u68/board.mk
index e5ff8242d..57af215bb 100644
--- a/hw/bsp/lpcxpresso51u68/board.mk
+++ b/hw/bsp/lpcxpresso51u68/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/lpcxpresso54114/board.mk b/hw/bsp/lpcxpresso54114/board.mk
index 88f2bc734..431ad9122 100644
--- a/hw/bsp/lpcxpresso54114/board.mk
+++ b/hw/bsp/lpcxpresso54114/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/mbed1768/board.mk b/hw/bsp/mbed1768/board.mk
index 1b09a7f7a..2b934aa16 100644
--- a/hw/bsp/mbed1768/board.mk
+++ b/hw/bsp/mbed1768/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/msp430/family.mk b/hw/bsp/msp430/family.mk
index a982c2866..53ebca1c0 100644
--- a/hw/bsp/msp430/family.mk
+++ b/hw/bsp/msp430/family.mk
@@ -1,5 +1,5 @@
 CROSS_COMPILE = msp430-elf-
-FAMILY_SUBMODULES = hw/mcu/ti
+DEPS_SUBMODULES = hw/mcu/ti
 SKIP_NANOLIB = 1
 
 CFLAGS += \
diff --git a/hw/bsp/ngx4330/board.mk b/hw/bsp/ngx4330/board.mk
index fe66fceb5..c78d4c02d 100644
--- a/hw/bsp/ngx4330/board.mk
+++ b/hw/bsp/ngx4330/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/nrf/family.mk b/hw/bsp/nrf/family.mk
index 4c9e36ed0..f1eb625f9 100644
--- a/hw/bsp/nrf/family.mk
+++ b/hw/bsp/nrf/family.mk
@@ -1,5 +1,5 @@
 UF2_FAMILY_ID = 0xADA52840
-FAMILY_SUBMODULES = hw/mcu/nordic/nrfx
+DEPS_SUBMODULES = hw/mcu/nordic/nrfx
 
 include $(TOP)/$(BOARD_PATH)/board.mk
 
diff --git a/hw/bsp/nutiny_nuc121s/board.mk b/hw/bsp/nutiny_nuc121s/board.mk
index ce18a749c..68688be76 100644
--- a/hw/bsp/nutiny_nuc121s/board.mk
+++ b/hw/bsp/nutiny_nuc121s/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nuvoton
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/nutiny_nuc125s/board.mk b/hw/bsp/nutiny_nuc125s/board.mk
index fe51b79d2..cb75f2ba2 100644
--- a/hw/bsp/nutiny_nuc125s/board.mk
+++ b/hw/bsp/nutiny_nuc125s/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nuvoton
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/nutiny_nuc126v/board.mk b/hw/bsp/nutiny_nuc126v/board.mk
index 30cb3df03..5beb5f457 100644
--- a/hw/bsp/nutiny_nuc126v/board.mk
+++ b/hw/bsp/nutiny_nuc126v/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nuvoton
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/nutiny_sdk_nuc120/board.mk b/hw/bsp/nutiny_sdk_nuc120/board.mk
index 0d3a3bff4..affa64058 100644
--- a/hw/bsp/nutiny_sdk_nuc120/board.mk
+++ b/hw/bsp/nutiny_sdk_nuc120/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nuvoton
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/nutiny_sdk_nuc505/board.mk b/hw/bsp/nutiny_sdk_nuc505/board.mk
index 99103fc65..8b2e53d44 100644
--- a/hw/bsp/nutiny_sdk_nuc505/board.mk
+++ b/hw/bsp/nutiny_sdk_nuc505/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/nuvoton
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/rp2040/family.mk b/hw/bsp/rp2040/family.mk
index b0fb58ff7..2778183f8 100644
--- a/hw/bsp/rp2040/family.mk
+++ b/hw/bsp/rp2040/family.mk
@@ -1,4 +1,4 @@
-FAMILY_SUBMODULES = hw/mcu/raspberrypi/pico-sdk
+DEPS_SUBMODULES = hw/mcu/raspberrypi/pico-sdk
 
 JLINK_DEVICE = rp2040_m0_0
 PYOCD_TARGET = rp2040
diff --git a/hw/bsp/samd11/family.mk b/hw/bsp/samd11/family.mk
index 9faa246d4..e0005d853 100644
--- a/hw/bsp/samd11/family.mk
+++ b/hw/bsp/samd11/family.mk
@@ -1,4 +1,4 @@
-FAMILY_SUBMODULES = hw/mcu/microchip
+DEPS_SUBMODULES = hw/mcu/microchip
 
 include $(TOP)/$(BOARD_PATH)/board.mk
 
diff --git a/hw/bsp/samd21/family.mk b/hw/bsp/samd21/family.mk
index 2d0a64e79..e748796fd 100644
--- a/hw/bsp/samd21/family.mk
+++ b/hw/bsp/samd21/family.mk
@@ -1,5 +1,5 @@
 UF2_FAMILY_ID = 0x68ed2b88
-FAMILY_SUBMODULES = hw/mcu/microchip
+DEPS_SUBMODULES = hw/mcu/microchip
 
 include $(TOP)/$(BOARD_PATH)/board.mk
 
diff --git a/hw/bsp/samd51/family.mk b/hw/bsp/samd51/family.mk
index 2c346680e..2cf8f0902 100644
--- a/hw/bsp/samd51/family.mk
+++ b/hw/bsp/samd51/family.mk
@@ -1,5 +1,5 @@
 UF2_FAMILY_ID = 0x55114460
-FAMILY_SUBMODULES = hw/mcu/microchip
+DEPS_SUBMODULES = hw/mcu/microchip
 
 include $(TOP)/$(BOARD_PATH)/board.mk
 
diff --git a/hw/bsp/same54xplainedpro/board.mk b/hw/bsp/same54xplainedpro/board.mk
index 9d2e4a74d..508ab20f8 100644
--- a/hw/bsp/same54xplainedpro/board.mk
+++ b/hw/bsp/same54xplainedpro/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/microchip
+
 CONF_CPU_FREQUENCY ?= 120000000
 
 CFLAGS += \
diff --git a/hw/bsp/same70_xplained/board.mk b/hw/bsp/same70_xplained/board.mk
index 21f5350c3..fd9dc5cf2 100644
--- a/hw/bsp/same70_xplained/board.mk
+++ b/hw/bsp/same70_xplained/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/microchip
+
 CFLAGS += \
   -mthumb \
   -mabi=aapcs \
diff --git a/hw/bsp/samg55xplained/board.mk b/hw/bsp/samg55xplained/board.mk
index b574a39e7..3a783d310 100644
--- a/hw/bsp/samg55xplained/board.mk
+++ b/hw/bsp/samg55xplained/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/microchip
+
 CFLAGS += \
   -flto \
   -mthumb \
diff --git a/hw/bsp/spresense/board.mk b/hw/bsp/spresense/board.mk
index 245976235..c04296cfa 100644
--- a/hw/bsp/spresense/board.mk
+++ b/hw/bsp/spresense/board.mk
@@ -1,3 +1,5 @@
+DEPS_SUBMODULES = hw/mcu/sony/cxd56/spresense-exported-sdk
+
 # Platforms are: Linux, Darwin, MSYS, CYGWIN
 PLATFORM := $(firstword $(subst _, ,$(shell uname -s 2>/dev/null)))
 
diff --git a/hw/bsp/stm32f070rbnucleo/board.mk b/hw/bsp/stm32f070rbnucleo/board.mk
index be2ce3b83..ac5b0dc4d 100644
--- a/hw/bsp/stm32f070rbnucleo/board.mk
+++ b/hw/bsp/stm32f070rbnucleo/board.mk
@@ -1,3 +1,9 @@
+ST_FAMILY = f0
+DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
+ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
+ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
 CFLAGS += \
   -flto \
   -mthumb \
@@ -12,9 +18,6 @@ CFLAGS += \
 # suppress warning caused by vendor mcu driver
 CFLAGS += -Wno-error=unused-parameter -Wno-error=cast-align
 
-ST_FAMILY = f0
-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)/stm32F070rbtx_flash.ld
diff --git a/hw/bsp/stm32f072disco/board.mk b/hw/bsp/stm32f072disco/board.mk
index bbb7baf5a..8aacdef3a 100644
--- a/hw/bsp/stm32f072disco/board.mk
+++ b/hw/bsp/stm32f072disco/board.mk
@@ -1,3 +1,9 @@
+ST_FAMILY = f0
+DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
+ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
+ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
 CFLAGS += \
   -flto \
   -mthumb \
@@ -12,10 +18,6 @@ CFLAGS += \
 # suppress warning caused by vendor mcu driver
 CFLAGS += -Wno-error=unused-parameter -Wno-error=cast-align
 
-ST_FAMILY = f0
-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)/STM32F072RBTx_FLASH.ld
 
diff --git a/hw/bsp/stm32f103bluepill/board.mk b/hw/bsp/stm32f103bluepill/board.mk
index e1517cfaa..60beff78d 100644
--- a/hw/bsp/stm32f103bluepill/board.mk
+++ b/hw/bsp/stm32f103bluepill/board.mk
@@ -1,3 +1,9 @@
+ST_FAMILY = f1
+DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
+ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
+ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
 CFLAGS += \
   -flto \
   -mthumb \
@@ -11,10 +17,6 @@ CFLAGS += \
 # mcu driver cause following warnings
 #CFLAGS += -Wno-error=unused-parameter
 
-ST_FAMILY = f1
-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)/STM32F103XB_FLASH.ld
 
diff --git a/hw/bsp/stm32f207nucleo/board.mk b/hw/bsp/stm32f207nucleo/board.mk
index 025c2d7b7..0a77d76e3 100644
--- a/hw/bsp/stm32f207nucleo/board.mk
+++ b/hw/bsp/stm32f207nucleo/board.mk
@@ -1,3 +1,9 @@
+ST_FAMILY = f2
+DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
+ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
+ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
 CFLAGS += \
   -flto \
   -mthumb \
@@ -11,11 +17,6 @@ CFLAGS += \
 # mcu driver cause following warnings
 CFLAGS += -Wno-error=sign-compare
 
-ST_FAMILY = f2
-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)/STM32F207ZGTx_FLASH.ld
 
diff --git a/hw/bsp/stm32f303disco/board.mk b/hw/bsp/stm32f303disco/board.mk
index 3abaf5cec..8ad1d0072 100644
--- a/hw/bsp/stm32f303disco/board.mk
+++ b/hw/bsp/stm32f303disco/board.mk
@@ -1,3 +1,9 @@
+ST_FAMILY = f3
+DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
+ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
+ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
 CFLAGS += \
   -flto \
   -mthumb \
@@ -12,10 +18,6 @@ CFLAGS += \
 # mcu driver cause following warnings
 CFLAGS += -Wno-error=unused-parameter
 
-ST_FAMILY = f3
-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)/STM32F303VCTx_FLASH.ld
 
diff --git a/hw/bsp/stm32f4/family.mk b/hw/bsp/stm32f4/family.mk
index 299f084de..cbda96e92 100644
--- a/hw/bsp/stm32f4/family.mk
+++ b/hw/bsp/stm32f4/family.mk
@@ -1,6 +1,6 @@
 UF2_FAMILY_ID = 0x57755a57
 ST_FAMILY = f4
-FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
 ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
 ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
diff --git a/hw/bsp/stm32f7/family.mk b/hw/bsp/stm32f7/family.mk
index 60d189a30..c405973de 100644
--- a/hw/bsp/stm32f7/family.mk
+++ b/hw/bsp/stm32f7/family.mk
@@ -1,6 +1,6 @@
 UF2_FAMILY_ID = 0x53b80f00
 ST_FAMILY = f7
-FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
 ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
 ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
diff --git a/hw/bsp/stm32h7/family.mk b/hw/bsp/stm32h7/family.mk
index 5e3c7cf35..2ec032ed9 100644
--- a/hw/bsp/stm32h7/family.mk
+++ b/hw/bsp/stm32h7/family.mk
@@ -1,6 +1,6 @@
 UF2_FAMILY_ID = 0x6db66082
 ST_FAMILY = h7
-FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
 
 ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
 ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
diff --git a/hw/bsp/stm32l0538disco/board.mk b/hw/bsp/stm32l0538disco/board.mk
index 2c9ffad69..6c8e89247 100644
--- a/hw/bsp/stm32l0538disco/board.mk
+++ b/hw/bsp/stm32l0538disco/board.mk
@@ -1,3 +1,9 @@
+ST_FAMILY = l0
+DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
+ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
+ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
 CFLAGS += \
   -flto \
   -mthumb \
@@ -12,10 +18,6 @@ CFLAGS += \
 # mcu driver cause following warnings
 CFLAGS += -Wno-error=unused-parameter -Wno-error=maybe-uninitialized
 
-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
 
diff --git a/hw/bsp/stm32l476disco/board.mk b/hw/bsp/stm32l476disco/board.mk
index 9e44598b0..ec02e0c1d 100644
--- a/hw/bsp/stm32l476disco/board.mk
+++ b/hw/bsp/stm32l476disco/board.mk
@@ -1,3 +1,9 @@
+ST_FAMILY = l4
+DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
+ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
+ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
 CFLAGS += \
   -flto \
   -mthumb \
@@ -12,10 +18,6 @@ CFLAGS += \
 # suppress warning caused by vendor mcu driver
 CFLAGS += -Wno-error=maybe-uninitialized -Wno-error=cast-align
 
-ST_FAMILY = l4
-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)/STM32L476VGTx_FLASH.ld
 
diff --git a/hw/bsp/stm32l4r5nucleo/board.mk b/hw/bsp/stm32l4r5nucleo/board.mk
index cee5ce86e..8ff38594d 100644
--- a/hw/bsp/stm32l4r5nucleo/board.mk
+++ b/hw/bsp/stm32l4r5nucleo/board.mk
@@ -1,3 +1,9 @@
+ST_FAMILY = l4
+DEPS_SUBMODULES = hw/mcu/st/cmsis_device_$(ST_FAMILY) hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
+ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY)
+ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver
+
 CFLAGS += \
   -flto \
   -mthumb \
@@ -13,10 +19,6 @@ CFLAGS += \
 # suppress warning caused by vendor mcu driver
 CFLAGS += -Wno-error=maybe-uninitialized -Wno-error=cast-align
 
-ST_FAMILY = l4
-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)/STM32L4RXxI_FLASH.ld