summaryrefslogtreecommitdiffstats
path: root/platforms
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2023-01-11 19:58:27 +0000
committerGitHub <noreply@github.com>2023-01-11 19:58:27 +0000
commit46c85c93f05003ecc9d5b9266bc78e98cc7a843b (patch)
tree0fb94d5c33159f1c6636fb7db992996f3dbd35c8 /platforms
parente11235ee14f9cd3fc45b836eec99ed312cb137dd (diff)
Revert "De-duplicate platform detection (#19545)" (#19564)
This reverts commit e11235ee14f9cd3fc45b836eec99ed312cb137dd.
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, 0 insertions, 9 deletions
diff --git a/platforms/arm_atsam/bootloader.mk b/platforms/arm_atsam/bootloader.mk
index 7e503bdca9..1ec42edeb6 100644
--- a/platforms/arm_atsam/bootloader.mk
+++ b/platforms/arm_atsam/bootloader.mk
@@ -27,8 +27,6 @@
# 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 36e3fd83db..63fe635d96 100644
--- a/platforms/avr/bootloader.mk
+++ b/platforms/avr/bootloader.mk
@@ -37,8 +37,6 @@
# 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 546faf2d27..0568d35321 100644
--- a/platforms/chibios/bootloader.mk
+++ b/platforms/chibios/bootloader.mk
@@ -36,8 +36,6 @@
# 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 fd4c6bd2e5..b2a8ec89e1 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -442,9 +442,6 @@ 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