From e11235ee14f9cd3fc45b836eec99ed312cb137dd Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 11 Jan 2023 02:13:32 +0000 Subject: De-duplicate platform detection (#19545) --- builddefs/build_keyboard.mk | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'builddefs/build_keyboard.mk') diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index 8999ac80ad..37466cbbe5 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -180,6 +180,13 @@ 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 @@ -257,24 +264,6 @@ 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)","") -- cgit v1.2.3 From 46c85c93f05003ecc9d5b9266bc78e98cc7a843b Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 11 Jan 2023 19:58:27 +0000 Subject: Revert "De-duplicate platform detection (#19545)" (#19564) This reverts commit e11235ee14f9cd3fc45b836eec99ed312cb137dd. --- builddefs/build_keyboard.mk | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'builddefs/build_keyboard.mk') 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)","") -- cgit v1.2.3 From 88ec588ae7f6d36b23578135cde8b7a5160ff8b7 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 18 Jan 2023 23:44:41 +0000 Subject: Remove `make all-` build targets (#19496) --- builddefs/build_keyboard.mk | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'builddefs/build_keyboard.mk') diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index 8999ac80ad..ec0336f7c3 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -433,13 +433,6 @@ SRC += $(TMK_COMMON_SRC) OPT_DEFS += $(TMK_COMMON_DEFS) EXTRALDFLAGS += $(TMK_COMMON_LDFLAGS) -SKIP_COMPILE := no -ifneq ($(REQUIRE_PLATFORM_KEY),) - ifneq ($(REQUIRE_PLATFORM_KEY),$(PLATFORM_KEY)) - SKIP_COMPILE := yes - endif -endif - -include $(PLATFORM_PATH)/$(PLATFORM_KEY)/bootloader.mk include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk -include $(PLATFORM_PATH)/$(PLATFORM_KEY)/flash.mk @@ -479,12 +472,7 @@ $(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC) $(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG) # Default target. -ifeq ($(SKIP_COMPILE),no) all: build check-size -else -all: - echo "skipped" >&2 -endif build: elf cpfirmware check-size: build -- cgit v1.2.3 From 0ce3f6bcfe8241e51dd6936d24e6a88c907c535d Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 19 Jan 2023 00:27:00 +0000 Subject: De-duplicate platform detection (#19603) --- builddefs/build_keyboard.mk | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'builddefs/build_keyboard.mk') diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index ec0336f7c3..6d355c9b85 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -184,6 +184,12 @@ include $(BUILDDEFS_PATH)/converters.mk include $(BUILDDEFS_PATH)/mcu_selection.mk +# 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:]') + # Find all the C source files to be compiled in subfolders. KEYBOARD_SRC := @@ -257,24 +263,6 @@ 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)","") -- cgit v1.2.3 From 832479c7fbc544a3e8b305af7df9996fa3c5ba00 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 28 Jan 2023 20:40:47 +0000 Subject: Split out mcu_selection to platform (#19701) --- builddefs/build_keyboard.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'builddefs/build_keyboard.mk') diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index 6d355c9b85..def0be69b6 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -182,7 +182,8 @@ endif include $(BUILDDEFS_PATH)/converters.mk -include $(BUILDDEFS_PATH)/mcu_selection.mk +MCU_ORIG := $(MCU) +include $(wildcard $(PLATFORM_PATH)/*/mcu_selection.mk) # PLATFORM_KEY should be detected in info.json via key 'processor' (or rules.mk 'MCU') ifeq ($(PLATFORM_KEY),) -- cgit v1.2.3