From 42e9adcfc9963b54c71e8851e1a6a41a001531e5 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Thu, 3 Nov 2022 12:41:28 -0400 Subject: armcm_reset: Introduce Kconfig FLASH_BOOT_ADDRESS value Specify the arm architecture flash bootup address for each chip type in Kconfig using a new FLASH_BOOT_ADDRESS setting. Signed-off-by: Kevin O'Connor --- src/rp2040/Kconfig | 6 +++++- src/rp2040/rp2040_link.lds.S | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/rp2040') diff --git a/src/rp2040/Kconfig b/src/rp2040/Kconfig index 37862d34..148222d7 100644 --- a/src/rp2040/Kconfig +++ b/src/rp2040/Kconfig @@ -31,6 +31,10 @@ config FLASH_SIZE hex default 0x200000 +config FLASH_BOOT_ADDRESS + hex + default 0x10000100 # Stage2 binary starts at 0x10000000 + config RAM_START hex default 0x20000000 @@ -45,7 +49,7 @@ config STACK_SIZE config FLASH_START hex - default 0x10000000 + default 0x10000100 ###################################################################### diff --git a/src/rp2040/rp2040_link.lds.S b/src/rp2040/rp2040_link.lds.S index 3ffcd909..43d6115e 100644 --- a/src/rp2040/rp2040_link.lds.S +++ b/src/rp2040/rp2040_link.lds.S @@ -4,14 +4,14 @@ // // This file may be distributed under the terms of the GNU GPLv3 license. -#include "autoconf.h" // CONFIG_FLASH_START +#include "autoconf.h" // CONFIG_FLASH_SIZE OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) MEMORY { - rom (rx) : ORIGIN = CONFIG_FLASH_START , LENGTH = CONFIG_FLASH_SIZE + rom (rx) : ORIGIN = 0x10000000 , LENGTH = CONFIG_FLASH_SIZE ram (rwx) : ORIGIN = CONFIG_RAM_START , LENGTH = CONFIG_RAM_SIZE } -- cgit v1.2.3-70-g09d2