summaryrefslogtreecommitdiff
path: root/platforms
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2023-01-19 00:27:00 +0000
committerGitHub <noreply@github.com>2023-01-19 00:27:00 +0000
commit0ce3f6bcfe8241e51dd6936d24e6a88c907c535d (patch)
tree216c96bb7d8037120a256d0c707150b95f5866bd /platforms
parenta1f253cbef309906c989cfb3e123ee8fb3172bb4 (diff)
De-duplicate platform detection (#19603)
Diffstat (limited to 'platforms')
-rw-r--r--platforms/arm_atsam/bootloader.mk2
-rw-r--r--platforms/avr/bootloader.mk2
-rw-r--r--platforms/chibios/bootloader.mk2
-rw-r--r--platforms/chibios/platform.mk3
4 files changed, 9 insertions, 0 deletions
diff --git a/platforms/arm_atsam/bootloader.mk b/platforms/arm_atsam/bootloader.mk
index 1ec42edeb6..7e503bdca9 100644
--- a/platforms/arm_atsam/bootloader.mk
+++ b/platforms/arm_atsam/bootloader.mk
@@ -27,6 +27,8 @@
# the respective file under `platforms/<PLATFORM>/bootloaders/custom.c` to see
# which functions may be overridden.
+FIRMWARE_FORMAT?=bin
+
ifeq ($(strip $(BOOTLOADER)), custom)
OPT_DEFS += -DBOOTLOADER_CUSTOM
BOOTLOADER_TYPE = custom
diff --git a/platforms/avr/bootloader.mk b/platforms/avr/bootloader.mk
index 63fe635d96..36e3fd83db 100644
--- a/platforms/avr/bootloader.mk
+++ b/platforms/avr/bootloader.mk
@@ -37,6 +37,8 @@
# BOOTLOADER_SIZE can still be defined manually, but it's recommended
# you add any possible configuration to this list
+FIRMWARE_FORMAT?=hex
+
ifeq ($(strip $(BOOTLOADER)), custom)
OPT_DEFS += -DBOOTLOADER_CUSTOM
BOOTLOADER_TYPE = custom
diff --git a/platforms/chibios/bootloader.mk b/platforms/chibios/bootloader.mk
index 85f1866062..4812412344 100644
--- a/platforms/chibios/bootloader.mk
+++ b/platforms/chibios/bootloader.mk
@@ -36,6 +36,8 @@
# the respective file under `platforms/<PLATFORM>/bootloaders/custom.c` to see
# which functions may be overridden.
+FIRMWARE_FORMAT?=bin
+
ifeq ($(strip $(BOOTLOADER)), custom)
OPT_DEFS += -DBOOTLOADER_CUSTOM
BOOTLOADER_TYPE = custom
diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
index b2a8ec89e1..fd4c6bd2e5 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -442,6 +442,9 @@ LDFLAGS += $(SHARED_LDFLAGS) $(SHARED_LDSYMBOLS) $(TOOLCHAIN_LDFLAGS) $(TOOLCHA
# Tell QMK that we are hosting it on ChibiOS.
OPT_DEFS += -DPROTOCOL_CHIBIOS
+# And what flavor of MCU
+OPT_DEFS += -DMCU_$(MCU_FAMILY)
+
# ChibiOS supports synchronization primitives like a Mutex
OPT_DEFS += -DPLATFORM_SUPPORTS_SYNCHRONIZATION