From 93bd061c0ee6d27eac16d892a05f19306146063f Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 27 Jan 2020 22:38:55 +0000 Subject: Migrate common ld scripts to common location (#7887) * Migrate common ld scripts to common location * Remove duplicate ld scripts * Update build to look at common ld location --- tmk_core/chibios.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tmk_core') diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index 62e1561878..b2e364f216 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk @@ -108,6 +108,8 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/ld/$(MCU_LDSCRIPT).ld)","") LDSCRIPT = $(KEYBOARD_PATH_2)/ld/$(MCU_LDSCRIPT).ld else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/ld/$(MCU_LDSCRIPT).ld)","") LDSCRIPT = $(KEYBOARD_PATH_1)/ld/$(MCU_LDSCRIPT).ld +else ifneq ("$(wildcard $(TOP_DIR)/drivers/boards/ld/$(MCU_LDSCRIPT).ld)","") + LDSCRIPT = $(TOP_DIR)/drivers/boards/ld/$(MCU_LDSCRIPT).ld else LDSCRIPT = $(STARTUPLD)/$(MCU_LDSCRIPT).ld endif -- cgit v1.2.3