This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new d1fd1ed8f6 boards/esp32s3: Merge MCUboot and "simple-boot" linker
scripts
d1fd1ed8f6 is described below
commit d1fd1ed8f660c7de3ca49b04d18b3d2af7bbc091
Author: Tiago Medicci Serrano <tiago.medi...@espressif.com>
AuthorDate: Fri Oct 18 12:16:40 2024 -0300
boards/esp32s3: Merge MCUboot and "simple-boot" linker scripts
To make it easier to keep the linker scripts updated for both
MCUboot and "simple-boot", this commit merges them into a single
linker script with macros to enable/disable specific sections.
---
arch/xtensa/src/esp32s3/esp32s3_spiram.c | 19 ++-
...simple_boot_sections.ld => esp32s3_sections.ld} | 186 ++++++++++++++-------
.../xtensa/esp32s3/common/scripts/flat_memory.ld | 2 +-
.../xtensa/esp32s3/esp32s3-box/scripts/Make.defs | 6 +-
.../esp32s3/esp32s3-devkit/scripts/Make.defs | 6 +-
.../xtensa/esp32s3/esp32s3-eye/scripts/Make.defs | 6 +-
.../esp32s3/esp32s3-korvo-2/scripts/Make.defs | 6 +-
.../esp32s3/esp32s3-lcd-ev/scripts/Make.defs | 6 +-
.../esp32s3/esp32s3-lhcbit/scripts/Make.defs | 6 +-
.../esp32s3/esp32s3-meadow/scripts/Make.defs | 6 +-
10 files changed, 154 insertions(+), 95 deletions(-)
diff --git a/arch/xtensa/src/esp32s3/esp32s3_spiram.c
b/arch/xtensa/src/esp32s3/esp32s3_spiram.c
index 2b9d0f01fe..44b72a027b 100644
--- a/arch/xtensa/src/esp32s3/esp32s3_spiram.c
+++ b/arch/xtensa/src/esp32s3/esp32s3_spiram.c
@@ -149,13 +149,26 @@ extern int cache_invalidate_addr(uint32_t addr, uint32_t
size);
static inline uint32_t mmu_valid_space(uint32_t *start_address)
{
- for (int i = 0; i < FLASH_MMU_TABLE_SIZE; i++)
+ /* Look for an invalid entry for the MMU table from the end of the it
+ * towards the beginning. This is done to make sure we have a room for
+ * mapping the the SPIRAM
+ */
+
+ for (int i = (FLASH_MMU_TABLE_SIZE - 1); i >= 0; i--)
{
if (FLASH_MMU_TABLE[i] & MMU_INVALID)
{
- *start_address = DRAM0_CACHE_ADDRESS_LOW + i * MMU_PAGE_SIZE;
- return (FLASH_MMU_TABLE_SIZE - i) * MMU_PAGE_SIZE;
+ continue;
}
+
+ /* Add 1 to i to identify the first MMU table entry not set found
+ * backwards.
+ */
+
+ i++;
+
+ *start_address = DRAM0_CACHE_ADDRESS_LOW + (i) * MMU_PAGE_SIZE;
+ return (FLASH_MMU_TABLE_SIZE - i) * MMU_PAGE_SIZE;
}
return 0;
diff --git a/boards/xtensa/esp32s3/common/scripts/simple_boot_sections.ld
b/boards/xtensa/esp32s3/common/scripts/esp32s3_sections.ld
similarity index 87%
rename from boards/xtensa/esp32s3/common/scripts/simple_boot_sections.ld
rename to boards/xtensa/esp32s3/common/scripts/esp32s3_sections.ld
index cdae1e4e5f..2c336a4ada 100644
--- a/boards/xtensa/esp32s3/common/scripts/simple_boot_sections.ld
+++ b/boards/xtensa/esp32s3/common/scripts/esp32s3_sections.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/xtensa/esp32s3/common/scripts/simple_boot_sections.ld
+ * boards/xtensa/esp32s3/common/scripts/esp32s3_sections.ld
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -28,9 +28,42 @@ _diram_i_start = 0x40378000;
SECTIONS
{
+#ifdef CONFIG_ESP32S3_APP_FORMAT_MCUBOOT
+ .metadata :
+ {
+ /* Magic for load header */
+
+ LONG(0xace637d3)
+
+ /* Application entry point address */
+
+ KEEP(*(.entry_addr))
+
+ /* IRAM metadata:
+ * - Destination address (VMA) for IRAM region
+ * - Flash offset (LMA) for start of IRAM region
+ * - Size of IRAM region
+ */
+
+ LONG(ADDR(.iram0.vectors))
+ LONG(LOADADDR(.iram0.vectors))
+ LONG(LOADADDR(.iram0.text) + SIZEOF(.iram0.text) -
LOADADDR(.iram0.vectors))
+
+ /* DRAM metadata:
+ * - Destination address (VMA) for DRAM region
+ * - Flash offset (LMA) for start of DRAM region
+ * - Size of DRAM region
+ */
+
+ LONG(ADDR(.dram0.data))
+ LONG(LOADADDR(.dram0.data))
+ LONG(SIZEOF(.dram0.data))
+ } >metadata
+#endif /* CONFIG_ESP32S3_APP_FORMAT_MCUBOOT */
+
/* Send .iram0 code to iram */
- .iram0.vectors :
+ .iram0.vectors : ALIGN(4)
{
_iram_start = ABSOLUTE(.);
@@ -71,13 +104,13 @@ SECTIONS
_init_end = ABSOLUTE(.);
} >iram0_0_seg AT>ROM
- .iram0.text :
+ .iram0.text : ALIGN(4)
{
/* Code marked as running out of IRAM */
*(.iram1 .iram1.*)
esp32s3_start.*(.literal .text .literal.* .text.*)
- esp32s3_region.*(.text .text.* .literal .literal.*)
+ esp32s3_region.*(.literal .text .literal.* .text.*)
*libarch.a:*esp_loader.*(.literal .text .literal.* .text.*)
*libarch.a:esp32s3_cpuindex.*(.literal .text .literal.* .text.*)
@@ -214,7 +247,39 @@ SECTIONS
. = ALIGN(4) + 16;
_iram_text = ABSOLUTE(.);
- } >iram0_0_seg AT > ROM
+ } >iram0_0_seg
+
+ /* Marks the end of IRAM code segment */
+
+ .iram0.text_end (NOLOAD) :
+ {
+ /* ESP32-S3 memprot requires 16B padding for possible CPU prefetch and
+ * 256B alignment for PMS split lines.
+ */
+
+ . += 16;
+ . = ALIGN(256);
+ _iram_end = ABSOLUTE(.);
+ } >iram0_0_seg
+
+ .iram0.data :
+ {
+ . = ALIGN(4);
+
+ *(.iram.data)
+ *(.iram.data.*)
+ } >iram0_0_seg
+
+ .iram0.bss (NOLOAD) :
+ {
+ . = ALIGN(4);
+
+ *(.iram.bss)
+ *(.iram.bss.*)
+
+ . = ALIGN(4);
+ _iram_end = ABSOLUTE(.);
+ } >iram0_0_seg
.dram0.dummy (NOLOAD) :
{
@@ -267,9 +332,10 @@ SECTIONS
. = ALIGN(4);
} >dram0_0_seg
- .dram0.data :
+ .dram0.data : ALIGN(4)
{
/* .data initialized on power-up in ROMed configurations. */
+
. = ALIGN (16);
_data_start = ABSOLUTE(.);
_sdata = ABSOLUTE(.);
@@ -388,16 +454,22 @@ SECTIONS
. = ALIGN(0x10000);
} > ROM
- .flash.rodata :
+ .flash.rodata : ALIGN(0x10000)
{
_rodata_reserved_start = ABSOLUTE(.);
_srodata = ABSOLUTE(.);
- *(EXCLUDE_FILE (esp32s3_start.*) .rodata)
- *(EXCLUDE_FILE (esp32s3_start.*) .rodata.*)
+ *(EXCLUDE_FILE (esp32s3_start.* esp32s3_region.*
+ *libarch.a:*esp_loader.*
+ *libarch.a:esp32s3_spiflash.*
+ *libarch.a:*cache_hal.* *libarch.a:*mmu_hal.*
+ *libarch.a:*mpu_hal.*) .rodata)
+ *(EXCLUDE_FILE (esp32s3_start.* esp32s3_region.*
+ *libarch.a:*esp_loader.*
+ *libarch.a:esp32s3_spiflash.*
+ *libarch.a:*cache_hal.* *libarch.a:*mmu_hal.*
+ *libarch.a:*mpu_hal.*) .rodata.*)
- *(.rodata)
- *(.rodata.*)
#ifdef CONFIG_ESP32S3_WIRELESS
*(.rodata_wlog_verbose.*)
*(.rodata_wlog_debug.*)
@@ -450,31 +522,37 @@ SECTIONS
*(.gnu.linkonce.lit4.*)
_lit4_end = ABSOLUTE(.);
. = ALIGN(4);
- } >drom0_0_seg AT>ROM
-
- .flash.rodata_noload (NOLOAD) :
- {
- /*
- This is a symbol marking the flash.rodata end, this can be
- used for mmu driver to maintain virtual address
- We don't need to include the noload rodata in this section
- */
_rodata_reserved_end = ABSOLUTE(.);
- . = ALIGN (4);
- mapping[rodata_noload]
- } >drom0_0_seg
+ } >drom0_0_seg AT>ROM
_image_irom_vma = ADDR(.flash.text);
_image_irom_lma = LOADADDR(.flash.text);
_image_irom_size = LOADADDR(.flash.text) + SIZEOF(.flash.text) -
_image_irom_lma;
- .flash.text_dummy (NOLOAD) :
+ /* The alignment of the ".flash.text" output section is forced to
+ * 0x00010000 (64KB) to ensure that it will be allocated at the beginning
+ * of the next available Flash block.
+ * This is required to meet the following constraint from the external
+ * flash MMU:
+ * VMA % 64KB == LMA % 64KB
+ * i.e. the lower 16 bits of both the virtual address (address seen by the
+ * CPU) and the load address (physical address of the external flash) must
+ * be equal.
+ */
+
+#ifndef CONFIG_ESP32S3_RUN_IRAM
+ .flash.text_dummy (NOLOAD) : ALIGN(0x10000)
{
- . += SIZEOF(.flash.rodata);
- . = ALIGN(0x10000);
- } >default_code_seg AT> ROM
+ /* This section is required to skip .flash.rodata area because irom0_0_seg
+ * and drom0_0_seg reflect the same address space on different buses.
+ */
+
+ . += _image_drom_lma;
+ . += _image_drom_size;
+ } >irom0_0_seg
+#endif
- .flash.text :
+ .flash.text : ALIGN(0x00010000)
{
_stext = .;
_instruction_reserved_start = ABSOLUTE(.);
@@ -504,62 +582,44 @@ SECTIONS
_etext = .;
} >irom0_0_seg AT>ROM
- /* Marks the end of IRAM code segment */
-
- .iram0.text_end (NOLOAD) :
- {
- /* ESP32-S3 memprot requires 16B padding for possible CPU prefetch and
- * 256B alignment for PMS split lines.
- */
-
- . += 16;
- . = ALIGN(256);
- _iram_end = ABSOLUTE(.);
- } >iram0_0_seg
-
- .iram0.data :
- {
- . = ALIGN(4);
-
- *(.iram.data)
- *(.iram.data.*)
- } >iram0_0_seg
-
- .iram0.bss (NOLOAD) :
- {
- . = ALIGN(4);
-
- *(.iram.bss)
- *(.iram.bss.*)
-
- . = ALIGN(4);
- _iram_end = ABSOLUTE(.);
- } >iram0_0_seg
-
.rtc.text :
{
. = ALIGN(4);
*(.rtc.literal .rtc.text)
} >rtc_iram_seg AT>ROM
+ .rtc.dummy (NOLOAD) :
+ {
+ /* This section is required to skip .rtc.text area because the text and
+ * data segments reflect the same address space on different buses.
+ */
+
+ . = SIZEOF(.rtc.text);
+ } >rtc_data_seg
+
/* RTC BSS section. */
.rtc.bss (NOLOAD) :
{
*(.rtc.bss)
- } >rtc_slow_seg
+ } >rtc_data_seg
.rtc.data :
{
- . = ALIGN(4);
*(.rtc.data)
*(.rtc.data.*)
*(.rtc.rodata)
*(.rtc.rodata.*)
- /* Whatever is left from the RTC memory is used as a special heap. */
+ /* Whatever is left from the RTC memory is used as a special heap. */
. = ALIGN (4);
+ } >rtc_data_seg AT>ROM
+
+ .rtc.heap : ALIGN(4)
+ {
+ /* RTC heap is placed at the slow RTC memory. */
+
_srtcheap = ABSOLUTE(.);
} >rtc_slow_seg
diff --git a/boards/xtensa/esp32s3/common/scripts/flat_memory.ld
b/boards/xtensa/esp32s3/common/scripts/flat_memory.ld
index 84a84d0e9c..f576d0cc24 100644
--- a/boards/xtensa/esp32s3/common/scripts/flat_memory.ld
+++ b/boards/xtensa/esp32s3/common/scripts/flat_memory.ld
@@ -194,4 +194,4 @@ MEMORY
/* Mark the end of the RTC heap (top of the RTC region) */
-_ertcheap = 0x50001fff;
+_ertcheap = ORIGIN(rtc_slow_seg) + LENGTH(rtc_slow_seg);
diff --git a/boards/xtensa/esp32s3/esp32s3-box/scripts/Make.defs
b/boards/xtensa/esp32s3/esp32s3-box/scripts/Make.defs
index 2330231a36..2c6b757377 100644
--- a/boards/xtensa/esp32s3/esp32s3-box/scripts/Make.defs
+++ b/boards/xtensa/esp32s3/esp32s3-box/scripts/Make.defs
@@ -34,10 +34,8 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y)
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
else
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
- ifeq ($(CONFIG_ESP32S3_APP_FORMAT_MCUBOOT),y)
- ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
- else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y)
- ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld)
+ ifneq ($(CONFIG_ESP32S3_APP_FORMAT_LEGACY),y)
+ ARCHSCRIPT += $(call FINDSCRIPT,esp32s3_sections.ld)
else
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
endif
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/scripts/Make.defs
b/boards/xtensa/esp32s3/esp32s3-devkit/scripts/Make.defs
index a462497d54..d013412908 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/scripts/Make.defs
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/scripts/Make.defs
@@ -34,10 +34,8 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y)
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
else
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
- ifeq ($(CONFIG_ESP32S3_APP_FORMAT_MCUBOOT),y)
- ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
- else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y)
- ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld)
+ ifneq ($(CONFIG_ESP32S3_APP_FORMAT_LEGACY),y)
+ ARCHSCRIPT += $(call FINDSCRIPT,esp32s3_sections.ld)
else
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
endif
diff --git a/boards/xtensa/esp32s3/esp32s3-eye/scripts/Make.defs
b/boards/xtensa/esp32s3/esp32s3-eye/scripts/Make.defs
index 2652922f8d..9c55e7e5d1 100644
--- a/boards/xtensa/esp32s3/esp32s3-eye/scripts/Make.defs
+++ b/boards/xtensa/esp32s3/esp32s3-eye/scripts/Make.defs
@@ -34,10 +34,8 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y)
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
else
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
- ifeq ($(CONFIG_ESP32S3_APP_FORMAT_MCUBOOT),y)
- ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
- else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y)
- ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld)
+ ifneq ($(CONFIG_ESP32S3_APP_FORMAT_LEGACY),y)
+ ARCHSCRIPT += $(call FINDSCRIPT,esp32s3_sections.ld)
else
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
endif
diff --git a/boards/xtensa/esp32s3/esp32s3-korvo-2/scripts/Make.defs
b/boards/xtensa/esp32s3/esp32s3-korvo-2/scripts/Make.defs
index 56c7ea045c..a419c1ca9b 100644
--- a/boards/xtensa/esp32s3/esp32s3-korvo-2/scripts/Make.defs
+++ b/boards/xtensa/esp32s3/esp32s3-korvo-2/scripts/Make.defs
@@ -34,10 +34,8 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y)
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
else
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
- ifeq ($(CONFIG_ESP32S3_APP_FORMAT_MCUBOOT),y)
- ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
- else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y)
- ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld)
+ ifneq ($(CONFIG_ESP32S3_APP_FORMAT_LEGACY),y)
+ ARCHSCRIPT += $(call FINDSCRIPT,esp32s3_sections.ld)
else
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
endif
diff --git a/boards/xtensa/esp32s3/esp32s3-lcd-ev/scripts/Make.defs
b/boards/xtensa/esp32s3/esp32s3-lcd-ev/scripts/Make.defs
index ad0fac04c1..c3d5dbd449 100644
--- a/boards/xtensa/esp32s3/esp32s3-lcd-ev/scripts/Make.defs
+++ b/boards/xtensa/esp32s3/esp32s3-lcd-ev/scripts/Make.defs
@@ -34,10 +34,8 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y)
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
else
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
- ifeq ($(CONFIG_ESP32S3_APP_FORMAT_MCUBOOT),y)
- ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
- else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y)
- ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld)
+ ifneq ($(CONFIG_ESP32S3_APP_FORMAT_LEGACY),y)
+ ARCHSCRIPT += $(call FINDSCRIPT,esp32s3_sections.ld)
else
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
endif
diff --git a/boards/xtensa/esp32s3/esp32s3-lhcbit/scripts/Make.defs
b/boards/xtensa/esp32s3/esp32s3-lhcbit/scripts/Make.defs
index f8c6db352a..5dbd71d72f 100644
--- a/boards/xtensa/esp32s3/esp32s3-lhcbit/scripts/Make.defs
+++ b/boards/xtensa/esp32s3/esp32s3-lhcbit/scripts/Make.defs
@@ -34,10 +34,8 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y)
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
else
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
- ifeq ($(CONFIG_ESP32S3_APP_FORMAT_MCUBOOT),y)
- ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
- else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y)
- ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld)
+ ifneq ($(CONFIG_ESP32S3_APP_FORMAT_LEGACY),y)
+ ARCHSCRIPT += $(call FINDSCRIPT,esp32s3_sections.ld)
else
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
endif
diff --git a/boards/xtensa/esp32s3/esp32s3-meadow/scripts/Make.defs
b/boards/xtensa/esp32s3/esp32s3-meadow/scripts/Make.defs
index 818ea4dc15..5a539076ef 100644
--- a/boards/xtensa/esp32s3/esp32s3-meadow/scripts/Make.defs
+++ b/boards/xtensa/esp32s3/esp32s3-meadow/scripts/Make.defs
@@ -34,10 +34,8 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y)
ARCHSCRIPT += $(call FINDSCRIPT,kernel-space.ld)
else
ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld)
- ifeq ($(CONFIG_ESP32S3_APP_FORMAT_MCUBOOT),y)
- ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld)
- else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y)
- ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld)
+ ifneq ($(CONFIG_ESP32S3_APP_FORMAT_LEGACY),y)
+ ARCHSCRIPT += $(call FINDSCRIPT,esp32s3_sections.ld)
else
ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld)
endif
