diff options
| author | Nick Brassel <nick@tzarc.org> | 2022-03-07 21:04:22 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-07 21:04:22 +1100 |
| commit | 44f1bd9b3a9185951c283ceb5eeb2ecc2be72418 (patch) | |
| tree | 6f1439e605c94af81c5bb9be62cec6aaad55f923 /platforms/chibios/platform.mk | |
| parent | 5de515526d46787100dcab1588aab51178c6cb8d (diff) | |
ChibiOS 21.11.1 update. (#16251)
* ChibiOS 21.11.1 update.
* `uf2-tinyuf2` => `tinyuf2`
* Updated chibios-contrib, fixup preprocessor for tinyuf2 bootloader.
* Fixup keychron L433 boards.
* Makefile cleanup.
* RISC-V build fixes.
* Fixup RISC-V build.
Diffstat (limited to 'platforms/chibios/platform.mk')
| -rw-r--r-- | platforms/chibios/platform.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk index 6fd1fd83f5..91dd0479bc 100644 --- a/platforms/chibios/platform.mk +++ b/platforms/chibios/platform.mk @@ -39,7 +39,6 @@ ifeq ($(strip $(MCU)), risc-v) STARTUP_MK = $(CHIBIOS_CONTRIB)/os/common/startup/RISCV-ECLIC/compilers/GCC/mk/startup_$(MCU_STARTUP).mk PORT_V = $(CHIBIOS_CONTRIB)/os/common/ports/RISCV-ECLIC/compilers/GCC/mk/port.mk RULESPATH = $(CHIBIOS_CONTRIB)/os/common/startup/RISCV-ECLIC/compilers/GCC - PLATFORM_MK = $(CHIBIOS_CONTRIB)/os/hal/ports/GD/GD32VF103/platform.mk else # ARM Support CHIBIOS_PORT ?= @@ -82,10 +81,15 @@ ifeq ("$(PLATFORM_NAME)","") PLATFORM_NAME = platform endif +# If no MCU port name was specified, use the family instead +ifeq ("$(MCU_PORT_NAME)","") + MCU_PORT_NAME = $(MCU_FAMILY) +endif + ifeq ("$(wildcard $(PLATFORM_MK))","") - PLATFORM_MK = $(CHIBIOS)/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)/$(PLATFORM_NAME).mk + PLATFORM_MK = $(CHIBIOS)/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)/$(PLATFORM_NAME).mk ifeq ("$(wildcard $(PLATFORM_MK))","") - PLATFORM_MK = $(CHIBIOS_CONTRIB)/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)/$(PLATFORM_NAME).mk + PLATFORM_MK = $(CHIBIOS_CONTRIB)/os/hal/ports/$(MCU_PORT_NAME)/$(MCU_SERIES)/$(PLATFORM_NAME).mk endif endif |