diff options
| author | hathach <[email protected]> | 2021-03-03 20:25:44 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2021-03-03 20:25:44 +0700 |
| commit | 16f501a14eb98ef393d73d2a2dc3eb3653e98437 (patch) | |
| tree | 05685eeda354a69a391cd98ccf967991b6b8f618 | |
| parent | 5d226ee733cd6de950a98f16238904ca6d351ca9 (diff) | |
clean up
| -rw-r--r-- | hw/bsp/stm32f4/family.mk | 10 | ||||
| -rw-r--r-- | hw/bsp/stm32f7/family.mk | 10 | ||||
| -rw-r--r-- | hw/bsp/stm32h7/family.mk | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/hw/bsp/stm32f4/family.mk b/hw/bsp/stm32f4/family.mk index c974dc109..299f084de 100644 --- a/hw/bsp/stm32f4/family.mk +++ b/hw/bsp/stm32f4/family.mk @@ -1,5 +1,9 @@ UF2_FAMILY_ID = 0x57755a57 -FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_f4 hw/mcu/st/stm32f4xx_hal_driver +ST_FAMILY = f4 +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 include $(TOP)/$(BOARD_PATH)/board.mk @@ -16,10 +20,6 @@ CFLAGS += \ # suppress warning caused by vendor mcu driver CFLAGS += -Wno-error=cast-align -ST_FAMILY = f4 -ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) -ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver - SRC_C += \ $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \ $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \ diff --git a/hw/bsp/stm32f7/family.mk b/hw/bsp/stm32f7/family.mk index a0f51df86..60d189a30 100644 --- a/hw/bsp/stm32f7/family.mk +++ b/hw/bsp/stm32f7/family.mk @@ -1,5 +1,9 @@ UF2_FAMILY_ID = 0x53b80f00 -FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_f7 hw/mcu/st/stm32f7xx_hal_driver +ST_FAMILY = f7 +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 include $(TOP)/$(BOARD_PATH)/board.mk @@ -29,10 +33,6 @@ endif # mcu driver cause following warnings CFLAGS += -Wno-error=shadow -Wno-error=cast-align -ST_FAMILY = f7 -ST_CMSIS = hw/mcu/st/cmsis_device_$(ST_FAMILY) -ST_HAL_DRIVER = hw/mcu/st/stm32$(ST_FAMILY)xx_hal_driver - SRC_C += \ $(ST_CMSIS)/Source/Templates/system_stm32$(ST_FAMILY)xx.c \ $(ST_HAL_DRIVER)/Src/stm32$(ST_FAMILY)xx_hal.c \ diff --git a/hw/bsp/stm32h7/family.mk b/hw/bsp/stm32h7/family.mk index efa9b1aca..5e3c7cf35 100644 --- a/hw/bsp/stm32h7/family.mk +++ b/hw/bsp/stm32h7/family.mk @@ -1,7 +1,7 @@ UF2_FAMILY_ID = 0x6db66082 -FAMILY_SUBMODULES = hw/mcu/st/cmsis_device_h7 hw/mcu/st/stm32h7xx_hal_driver - ST_FAMILY = h7 +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 |