diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2024-01-20 19:58:23 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2024-01-25 11:03:40 -0500 |
| commit | 23c5b20f5ba6bbb27c3b5404f7b0912dba511eb5 (patch) | |
| tree | f58c87f1aaa50480804e959365af8c9102854e1b /src/rp2040 | |
| parent | 55e46aa6250382367af30d3a5e005e919d772d32 (diff) | |
| download | kutter-23c5b20f5ba6bbb27c3b5404f7b0912dba511eb5.tar.gz kutter-23c5b20f5ba6bbb27c3b5404f7b0912dba511eb5.tar.xz kutter-23c5b20f5ba6bbb27c3b5404f7b0912dba511eb5.zip | |
rp2040: Always link using rp2040_link.lds.S
Use the rp2040 specific linker script even when using a bootloader.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/rp2040')
| -rw-r--r-- | src/rp2040/Makefile | 2 | ||||
| -rw-r--r-- | src/rp2040/rp2040_link.lds.S | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/rp2040/Makefile b/src/rp2040/Makefile index 71ed90a0..64199014 100644 --- a/src/rp2040/Makefile +++ b/src/rp2040/Makefile @@ -55,7 +55,7 @@ $(OUT)klipper.bin: $(OUT)klipper.elf $(Q)$(OBJCOPY) -O binary $< $@ rptarget-$(CONFIG_RP2040_HAVE_BOOTLOADER) := $(OUT)klipper.bin -rplink-$(CONFIG_RP2040_HAVE_BOOTLOADER) := $(OUT)src/generic/armcm_link.ld +rplink-$(CONFIG_RP2040_HAVE_BOOTLOADER) := $(OUT)src/rp2040/rp2040_link.ld # Set klipper.elf linker rules target-y += $(rptarget-y) diff --git a/src/rp2040/rp2040_link.lds.S b/src/rp2040/rp2040_link.lds.S index 43d6115e..2052cdbd 100644 --- a/src/rp2040/rp2040_link.lds.S +++ b/src/rp2040/rp2040_link.lds.S @@ -1,6 +1,6 @@ // rp2040 linker script (based on armcm_link.lds.S and customized for stage2) // -// Copyright (C) 2019-2021 Kevin O'Connor <kevin@koconnor.net> +// Copyright (C) 2019-2024 Kevin O'Connor <kevin@koconnor.net> // // This file may be distributed under the terms of the GNU GPLv3 license. @@ -9,9 +9,15 @@ OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) +#if CONFIG_RP2040_HAVE_STAGE2 + #define ROM_ORIGIN 0x10000000 +#else + #define ROM_ORIGIN CONFIG_FLASH_APPLICATION_ADDRESS +#endif + MEMORY { - rom (rx) : ORIGIN = 0x10000000 , LENGTH = CONFIG_FLASH_SIZE + rom (rx) : ORIGIN = ROM_ORIGIN , LENGTH = CONFIG_FLASH_SIZE ram (rwx) : ORIGIN = CONFIG_RAM_START , LENGTH = CONFIG_RAM_SIZE } @@ -19,7 +25,9 @@ SECTIONS { .text : { . = ALIGN(4); +#if CONFIG_RP2040_HAVE_STAGE2 KEEP(*(.boot2)) +#endif _text_vectortable_start = .; KEEP(*(.vector_table)) _text_vectortable_end = .; |