Просмотр исходного кода

merge no-family example build

specify FAMILY_SUBMODULES for all boards
hathach 5 лет назад
Родитель
Сommit
b846ded487

+ 8 - 19
.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

+ 1 - 0
hw/bsp/d5035_01/board.mk

@@ -1,3 +1,4 @@
+FAMILY_SUBMODULES = hw/mcu/microchip
 HWREV ?= 1
 
 CFLAGS += \

+ 1 - 1
hw/bsp/da14695_dk_usb/board.mk

@@ -1,4 +1,4 @@
- CFLAGS += \
+CFLAGS += \
   -flto \
   -mthumb \
   -mthumb-interwork \

+ 1 - 1
hw/bsp/da1469x_dk_pro/board.mk

@@ -1,4 +1,4 @@
- CFLAGS += \
+CFLAGS += \
   -flto \
   -mthumb \
   -mthumb-interwork \

+ 2 - 0
hw/bsp/ea4088qs/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/ea4357/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/frdm_kl25z/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -mthumb \
   -mabi=aapcs \

+ 2 - 0
hw/bsp/lpcxpresso11u37/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/lpcxpresso11u68/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/lpcxpresso1347/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/lpcxpresso1549/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/lpcxpresso1769/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/lpcxpresso51u68/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/lpcxpresso54114/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/mbed1768/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/ngx4330/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/nutiny_nuc121s/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nuvoton
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/nutiny_nuc125s/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nuvoton
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/nutiny_nuc126v/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nuvoton
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/nutiny_sdk_nuc120/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nuvoton
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/nutiny_sdk_nuc505/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nuvoton
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/same54xplainedpro/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/microchip
+
 CONF_CPU_FREQUENCY ?= 120000000
 
 CFLAGS += \

+ 2 - 0
hw/bsp/same70_xplained/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/microchip
+
 CFLAGS += \
   -mthumb \
   -mabi=aapcs \

+ 2 - 0
hw/bsp/samg55xplained/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/microchip
+
 CFLAGS += \
   -flto \
   -mthumb \

+ 2 - 0
hw/bsp/spresense/board.mk

@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/sony/cxd56/spresense-exported-sdk
+
 # Platforms are: Linux, Darwin, MSYS, CYGWIN
 PLATFORM := $(firstword $(subst _, ,$(shell uname -s 2>/dev/null)))
 

+ 6 - 3
hw/bsp/stm32f070rbnucleo/board.mk

@@ -1,3 +1,9 @@
+ST_FAMILY = f0
+FAMILY_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

+ 6 - 4
hw/bsp/stm32f072disco/board.mk

@@ -1,3 +1,9 @@
+ST_FAMILY = f0
+FAMILY_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
 

+ 6 - 4
hw/bsp/stm32f103bluepill/board.mk

@@ -1,3 +1,9 @@
+ST_FAMILY = f1
+FAMILY_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
 

+ 6 - 5
hw/bsp/stm32f207nucleo/board.mk

@@ -1,3 +1,9 @@
+ST_FAMILY = f2
+FAMILY_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
 

+ 6 - 4
hw/bsp/stm32f303disco/board.mk

@@ -1,3 +1,9 @@
+ST_FAMILY = f3
+FAMILY_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
 

+ 6 - 4
hw/bsp/stm32l0538disco/board.mk

@@ -1,3 +1,9 @@
+ST_FAMILY = l0
+FAMILY_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
 

+ 6 - 4
hw/bsp/stm32l476disco/board.mk

@@ -1,3 +1,9 @@
+ST_FAMILY = l4
+FAMILY_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
 

+ 6 - 4
hw/bsp/stm32l4r5nucleo/board.mk

@@ -1,3 +1,9 @@
+ST_FAMILY = l4
+FAMILY_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