diff options
| author | Joel Challis <git@zvecr.com> | 2023-01-11 19:58:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-11 19:58:27 +0000 |
| commit | 46c85c93f05003ecc9d5b9266bc78e98cc7a843b (patch) | |
| tree | 0fb94d5c33159f1c6636fb7db992996f3dbd35c8 /builddefs | |
| parent | e11235ee14f9cd3fc45b836eec99ed312cb137dd (diff) | |
Revert "De-duplicate platform detection (#19545)" (#19564)
This reverts commit e11235ee14f9cd3fc45b836eec99ed312cb137dd.
Diffstat (limited to 'builddefs')
| -rw-r--r-- | builddefs/build_keyboard.mk | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index 37466cbbe5..8999ac80ad 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -180,13 +180,6 @@ generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c endif -# PLATFORM_KEY should be detected in info.json via key 'processor' (or rules.mk 'MCU') -ifeq ($(PLATFORM_KEY),) - $(call CATASTROPHIC_ERROR,Platform not defined) -endif -PLATFORM=$(shell echo $(PLATFORM_KEY) | tr '[:lower:]' '[:upper:]') - - include $(BUILDDEFS_PATH)/converters.mk include $(BUILDDEFS_PATH)/mcu_selection.mk @@ -264,6 +257,24 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/$(KEYBOARD_FOLDER_5).h)","") FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_5).h endif +# Determine and set parameters based on the keyboard's processor family. +# We can assume a ChibiOS target When MCU_FAMILY is defined since it's +# not used for LUFA +ifdef MCU_FAMILY + PLATFORM=CHIBIOS + PLATFORM_KEY=chibios + FIRMWARE_FORMAT?=bin + OPT_DEFS += -DMCU_$(MCU_FAMILY) +else ifdef ARM_ATSAM + PLATFORM=ARM_ATSAM + PLATFORM_KEY=arm_atsam + FIRMWARE_FORMAT=bin +else + PLATFORM=AVR + PLATFORM_KEY=avr + FIRMWARE_FORMAT?=hex +endif + # Find all of the config.h files and add them to our CONFIG_H define. CONFIG_H := ifneq ("$(wildcard $(KEYBOARD_PATH_5)/config.h)","") |