diff options
author | Joel Challis <git@zvecr.com> | 2020-01-27 22:38:55 +0000 |
---|---|---|
committer | Florian Didron <fdidron@users.noreply.github.com> | 2020-02-26 10:15:12 +0900 |
commit | 93bd061c0ee6d27eac16d892a05f19306146063f (patch) | |
tree | b43da9c102fa822c5bd5196b453ab61e22b9b443 /tmk_core | |
parent | 7e614bbdbafca299f9f4a296e2918240137e72b9 (diff) |
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
Diffstat (limited to 'tmk_core')
-rw-r--r-- | tmk_core/chibios.mk | 2 |
1 files changed, 2 insertions, 0 deletions
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 |