merge no-family example build

specify FAMILY_SUBMODULES for all boards
2021-03-04 22:50:45 +07:00
parent 1b6bf796e1
commit b846ded487
33 changed files with 101 additions and 53 deletions
--- a/hw/bsp/d5035_01/board.mk
+++ b/hw/bsp/d5035_01/board.mk
@@ -1,3 +1,4 @@
+FAMILY_SUBMODULES = hw/mcu/microchip
 HWREV ?= 1

 CFLAGS += \
--- 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 \
--- 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 \
--- a/hw/bsp/ea4088qs/board.mk
+++ b/hw/bsp/ea4088qs/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/ea4357/board.mk
+++ b/hw/bsp/ea4357/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/frdm_kl25z/board.mk
+++ b/hw/bsp/frdm_kl25z/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
  -mthumb \
  -mabi=aapcs \
--- a/hw/bsp/lpcxpresso11u37/board.mk
+++ b/hw/bsp/lpcxpresso11u37/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/lpcxpresso11u68/board.mk
+++ b/hw/bsp/lpcxpresso11u68/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/lpcxpresso1347/board.mk
+++ b/hw/bsp/lpcxpresso1347/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/lpcxpresso1549/board.mk
+++ b/hw/bsp/lpcxpresso1549/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/lpcxpresso1769/board.mk
+++ b/hw/bsp/lpcxpresso1769/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/lpcxpresso51u68/board.mk
+++ b/hw/bsp/lpcxpresso51u68/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/lpcxpresso54114/board.mk
+++ b/hw/bsp/lpcxpresso54114/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/mbed1768/board.mk
+++ b/hw/bsp/mbed1768/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/ngx4330/board.mk
+++ b/hw/bsp/ngx4330/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nxp
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/nutiny_nuc121s/board.mk
+++ b/hw/bsp/nutiny_nuc121s/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nuvoton
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/nutiny_nuc125s/board.mk
+++ b/hw/bsp/nutiny_nuc125s/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nuvoton
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/nutiny_nuc126v/board.mk
+++ b/hw/bsp/nutiny_nuc126v/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nuvoton
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/nutiny_sdk_nuc120/board.mk
+++ b/hw/bsp/nutiny_sdk_nuc120/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nuvoton
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/nutiny_sdk_nuc505/board.mk
+++ b/hw/bsp/nutiny_sdk_nuc505/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/nuvoton
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/same54xplainedpro/board.mk
+++ b/hw/bsp/same54xplainedpro/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/microchip
+
 CONF_CPU_FREQUENCY ?= 120000000

 CFLAGS += \
--- a/hw/bsp/same70_xplained/board.mk
+++ b/hw/bsp/same70_xplained/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/microchip
+
 CFLAGS += \
  -mthumb \
  -mabi=aapcs \
--- a/hw/bsp/samg55xplained/board.mk
+++ b/hw/bsp/samg55xplained/board.mk
@@ -1,3 +1,5 @@
+FAMILY_SUBMODULES = hw/mcu/microchip
+
 CFLAGS += \
  -flto \
  -mthumb \
--- a/hw/bsp/spresense/board.mk
+++ b/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)))

--- a/hw/bsp/stm32f070rbnucleo/board.mk
+++ b/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
--- a/hw/bsp/stm32f072disco/board.mk
+++ b/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

--- a/hw/bsp/stm32f103bluepill/board.mk
+++ b/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

--- a/hw/bsp/stm32f207nucleo/board.mk
+++ b/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

--- a/hw/bsp/stm32f303disco/board.mk
+++ b/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

--- a/hw/bsp/stm32l0538disco/board.mk
+++ b/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

--- a/hw/bsp/stm32l476disco/board.mk
+++ b/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

--- a/hw/bsp/stm32l4r5nucleo/board.mk
+++ b/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