diff options
| author | Joel Challis <git@zvecr.com> | 2020-01-27 22:38:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-27 22:38:55 +0000 |
| commit | 50855593ffcf7b6a780fa5f9c28fe6783264b5e2 (patch) | |
| tree | 7d2afb986d3b0cabf17c10f997737c73ddf21618 /tmk_core/chibios.mk | |
| parent | 9a0245b7784e11b34c5f44bcd2079af2e19ab654 (diff) | |
| download | firmware-50855593ffcf7b6a780fa5f9c28fe6783264b5e2.tar.gz firmware-50855593ffcf7b6a780fa5f9c28fe6783264b5e2.tar.bz2 firmware-50855593ffcf7b6a780fa5f9c28fe6783264b5e2.zip | |
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/chibios.mk')
| -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 62e156187..b2e364f21 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 |