From caeb610bb911291f8ca28129b6f5ed1b494f0fec Mon Sep 17 00:00:00 2001
From: Kevin O'Connor <kevin@koconnor.net>
Date: Thu, 22 Aug 2019 13:18:24 -0400
Subject: [PATCH] armcm_link: Rename armcm_boot.lds.S to armcm_link.lds.S
Rename the linker script so the build does not have any conflicts with
the armcm_boot.d dependency file.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---
src/atsam/Makefile | 4 ++--
src/atsamd/Makefile | 4 ++--
src/generic/armcm_boot.c | 2 +-
src/generic/{armcm_boot.lds.S => armcm_link.lds.S} | 0
src/lpc176x/Makefile | 4 ++--
src/stm32/Makefile | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
rename src/generic/{armcm_boot.lds.S => armcm_link.lds.S} (100%)
diff --git a/src/atsam/Makefile b/src/atsam/Makefile
index 1c2dc378a..35b624882 100644
--- a/src/atsam/Makefile
+++ b/src/atsam/Makefile
@@ -19,8 +19,8 @@ CFLAGS-$(CONFIG_MACH_SAM4E) += -Ilib/sam4e/include
CFLAGS += $(CFLAGS-y) -D__$(MCU)__ -mthumb -Ilib/cmsis-core
CFLAGS_klipper.elf += --specs=nano.specs --specs=nosys.specs
-CFLAGS_klipper.elf += -T $(OUT)src/generic/armcm_boot.ld
-$(OUT)klipper.elf: $(OUT)src/generic/armcm_boot.ld
+CFLAGS_klipper.elf += -T $(OUT)src/generic/armcm_link.ld
+$(OUT)klipper.elf: $(OUT)src/generic/armcm_link.ld
# Add source files
src-y += atsam/main.c atsam/gpio.c atsam/i2c.c atsam/spi.c atsam/hard_pwm.c
diff --git a/src/atsamd/Makefile b/src/atsamd/Makefile
index 82a1a4b01..4c943cbcf 100644
--- a/src/atsamd/Makefile
+++ b/src/atsamd/Makefile
@@ -15,8 +15,8 @@ CFLAGS-$(CONFIG_MACH_SAMD51) += -mfpu=fpv4-sp-d16 -mfloat-abi=hard
CFLAGS += $(CFLAGS-y) -D__$(MCU)__ -mthumb -Ilib/cmsis-core
CFLAGS_klipper.elf += --specs=nano.specs --specs=nosys.specs
-CFLAGS_klipper.elf += -T $(OUT)src/generic/armcm_boot.ld
-$(OUT)klipper.elf: $(OUT)src/generic/armcm_boot.ld
+CFLAGS_klipper.elf += -T $(OUT)src/generic/armcm_link.ld
+$(OUT)klipper.elf: $(OUT)src/generic/armcm_link.ld
# Add source files
src-y += atsamd/main.c atsamd/gpio.c
diff --git a/src/generic/armcm_boot.c b/src/generic/armcm_boot.c
index c559c1c18..e11e24124 100644
--- a/src/generic/armcm_boot.c
+++ b/src/generic/armcm_boot.c
@@ -7,7 +7,7 @@
#include "armcm_boot.h" // DECL_ARMCM_IRQ
#include "board/internal.h" // SystemInit
-// Symbols created by armcm_boot.lds.S linker script
+// Symbols created by armcm_link.lds.S linker script
extern uint32_t _data_start, _data_end, _data_flash;
extern uint32_t _bss_start, _bss_end, _stack_start;
diff --git a/src/generic/armcm_boot.lds.S b/src/generic/armcm_link.lds.S
similarity index 100%
rename from src/generic/armcm_boot.lds.S
rename to src/generic/armcm_link.lds.S
diff --git a/src/lpc176x/Makefile b/src/lpc176x/Makefile
index f4966ff76..ef5b0460a 100644
--- a/src/lpc176x/Makefile
+++ b/src/lpc176x/Makefile
@@ -8,8 +8,8 @@ dirs-y += src/lpc176x src/generic lib/lpc176x/device
CFLAGS += -mthumb -mcpu=cortex-m3 -Ilib/lpc176x/device -Ilib/cmsis-core
CFLAGS_klipper.elf += --specs=nano.specs --specs=nosys.specs
-CFLAGS_klipper.elf += -T $(OUT)src/generic/armcm_boot.ld
-$(OUT)klipper.elf: $(OUT)src/generic/armcm_boot.ld
+CFLAGS_klipper.elf += -T $(OUT)src/generic/armcm_link.ld
+$(OUT)klipper.elf: $(OUT)src/generic/armcm_link.ld
# Add source files
src-y += lpc176x/main.c lpc176x/gpio.c
diff --git a/src/stm32/Makefile b/src/stm32/Makefile
index 144a23a23..710c9f83b 100644
--- a/src/stm32/Makefile
+++ b/src/stm32/Makefile
@@ -16,8 +16,8 @@ CFLAGS-$(CONFIG_MACH_STM32F4) += -mfpu=fpv4-sp-d16 -mfloat-abi=hard
CFLAGS += $(CFLAGS-y) -D$(MCU_UPPER) -mthumb -Ilib/cmsis-core
CFLAGS_klipper.elf += --specs=nano.specs --specs=nosys.specs
-CFLAGS_klipper.elf += -T $(OUT)src/generic/armcm_boot.ld
-$(OUT)klipper.elf: $(OUT)src/generic/armcm_boot.ld
+CFLAGS_klipper.elf += -T $(OUT)src/generic/armcm_link.ld
+$(OUT)klipper.elf: $(OUT)src/generic/armcm_link.ld
# Add source files
src-y += stm32/main.c stm32/watchdog.c stm32/gpio.c generic/armcm_boot.c