drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Revert "De-duplicate platform detection (#19545)" (#19564)

Browse source 
This reverts commit e11235ee14.
This commit is contained in:
Joel Challis 2023-01-11 19:58:27 +00:00 • committed by GitHub
parent e11235ee14
commit 46c85c93f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platforms/arm_atsam/bootloader.mk
View file

@ -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

2
platforms/avr/bootloader.mk
View file

@ -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

2
platforms/chibios/bootloader.mk
View file

@ -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

3
platforms/chibios/platform.mk
View file

@ -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