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
commit 407a62a33abdfffb3fd92c6b272a49d280adf4c2 Author: Filipe Cavalcanti <[email protected]> AuthorDate: Mon Jan 6 11:35:13 2025 -0300 boards/xtensa: update Make.defs for linker scripts on ESP32|S2 --- boards/xtensa/esp32/esp32-2432S028/scripts/Make.defs | 8 +++----- boards/xtensa/esp32/esp32-audio-kit/scripts/Make.defs | 8 +++----- boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs | 8 +++----- boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs | 8 +++----- boards/xtensa/esp32/esp32-lyrat/scripts/Make.defs | 8 +++----- boards/xtensa/esp32/esp32-pico-kit/scripts/Make.defs | 8 +++----- boards/xtensa/esp32/esp32-sparrow-kit/scripts/Make.defs | 8 +++----- boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs | 8 +++----- boards/xtensa/esp32/lilygo_tbeam_lora_gps/scripts/Make.defs | 8 +++----- boards/xtensa/esp32/ttgo_eink5_v2/scripts/Make.defs | 8 +++----- boards/xtensa/esp32/ttgo_lora_esp32/scripts/Make.defs | 8 +++----- boards/xtensa/esp32/ttgo_t_display_esp32/scripts/Make.defs | 8 +++----- boards/xtensa/esp32s2/esp32s2-kaluga-1/scripts/Make.defs | 7 +------ boards/xtensa/esp32s2/esp32s2-saola-1/scripts/Make.defs | 7 +------ boards/xtensa/esp32s2/franzininho-wifi/scripts/Make.defs | 6 +----- 15 files changed, 39 insertions(+), 77 deletions(-) diff --git a/boards/xtensa/esp32/esp32-2432S028/scripts/Make.defs b/boards/xtensa/esp32/esp32-2432S028/scripts/Make.defs index 244b2cf1a1..2eaa4fff7e 100644 --- a/boards/xtensa/esp32/esp32-2432S028/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-2432S028/scripts/Make.defs @@ -34,12 +34,10 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y) else ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld) - ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld) - else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld) - else + ifeq ($(CONFIG_ESP32_APP_FORMAT_LEGACY),y) ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld) + else + ARCHSCRIPT += $(call FINDSCRIPT,esp32_sections.ld) endif endif diff --git a/boards/xtensa/esp32/esp32-audio-kit/scripts/Make.defs b/boards/xtensa/esp32/esp32-audio-kit/scripts/Make.defs index e5ba450a71..c29a96d044 100644 --- a/boards/xtensa/esp32/esp32-audio-kit/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-audio-kit/scripts/Make.defs @@ -34,12 +34,10 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y) else ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld) - ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld) - else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld) - else + ifeq ($(CONFIG_ESP32_APP_FORMAT_LEGACY),y) ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld) + else + ARCHSCRIPT += $(call FINDSCRIPT,esp32_sections.ld) endif endif diff --git a/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs b/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs index c8d940eed4..93b0935821 100644 --- a/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-devkitc/scripts/Make.defs @@ -34,12 +34,10 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y) else ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld) - ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld) - else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld) - else + ifeq ($(CONFIG_ESP32_APP_FORMAT_LEGACY),y) ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld) + else + ARCHSCRIPT += $(call FINDSCRIPT,esp32_sections.ld) endif endif diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs b/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs index 7356bde03d..7a318591d8 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-ethernet-kit/scripts/Make.defs @@ -34,12 +34,10 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y) else ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld) - ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld) - else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld) - else + ifeq ($(CONFIG_ESP32_APP_FORMAT_LEGACY),y) ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld) + else + ARCHSCRIPT += $(call FINDSCRIPT,esp32_sections.ld) endif endif diff --git a/boards/xtensa/esp32/esp32-lyrat/scripts/Make.defs b/boards/xtensa/esp32/esp32-lyrat/scripts/Make.defs index 71286505c9..332bd3d994 100644 --- a/boards/xtensa/esp32/esp32-lyrat/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-lyrat/scripts/Make.defs @@ -34,12 +34,10 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y) else ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld) - ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld) - else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld) - else + ifeq ($(CONFIG_ESP32_APP_FORMAT_LEGACY),y) ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld) + else + ARCHSCRIPT += $(call FINDSCRIPT,esp32_sections.ld) endif endif diff --git a/boards/xtensa/esp32/esp32-pico-kit/scripts/Make.defs b/boards/xtensa/esp32/esp32-pico-kit/scripts/Make.defs index 78fa330e38..692e1e492e 100644 --- a/boards/xtensa/esp32/esp32-pico-kit/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-pico-kit/scripts/Make.defs @@ -34,12 +34,10 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y) else ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld) - ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld) - else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld) - else + ifeq ($(CONFIG_ESP32_APP_FORMAT_LEGACY),y) ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld) + else + ARCHSCRIPT += $(call FINDSCRIPT,esp32_sections.ld) endif endif diff --git a/boards/xtensa/esp32/esp32-sparrow-kit/scripts/Make.defs b/boards/xtensa/esp32/esp32-sparrow-kit/scripts/Make.defs index 1dd3588144..27e393d352 100644 --- a/boards/xtensa/esp32/esp32-sparrow-kit/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-sparrow-kit/scripts/Make.defs @@ -34,12 +34,10 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y) else ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld) - ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld) - else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld) - else + ifeq ($(CONFIG_ESP32_APP_FORMAT_LEGACY),y) ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld) + else + ARCHSCRIPT += $(call FINDSCRIPT,esp32_sections.ld) endif endif diff --git a/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs b/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs index 9742c96ed7..4e8ce30a04 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs +++ b/boards/xtensa/esp32/esp32-wrover-kit/scripts/Make.defs @@ -34,12 +34,10 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y) else ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld) - ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld) - else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld) - else + ifeq ($(CONFIG_ESP32_APP_FORMAT_LEGACY),y) ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld) + else + ARCHSCRIPT += $(call FINDSCRIPT,esp32_sections.ld) endif endif diff --git a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/scripts/Make.defs b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/scripts/Make.defs index ec01cb2a63..3ba9ebf273 100644 --- a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/scripts/Make.defs +++ b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/scripts/Make.defs @@ -34,12 +34,10 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y) else ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld) - ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld) - else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld) - else + ifeq ($(CONFIG_ESP32_APP_FORMAT_LEGACY),y) ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld) + else + ARCHSCRIPT += $(call FINDSCRIPT,esp32_sections.ld) endif endif diff --git a/boards/xtensa/esp32/ttgo_eink5_v2/scripts/Make.defs b/boards/xtensa/esp32/ttgo_eink5_v2/scripts/Make.defs index 65b14b6218..388cb0b078 100644 --- a/boards/xtensa/esp32/ttgo_eink5_v2/scripts/Make.defs +++ b/boards/xtensa/esp32/ttgo_eink5_v2/scripts/Make.defs @@ -34,12 +34,10 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y) else ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld) - ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld) - else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld) - else + ifeq ($(CONFIG_ESP32_APP_FORMAT_LEGACY),y) ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld) + else + ARCHSCRIPT += $(call FINDSCRIPT,esp32_sections.ld) endif endif diff --git a/boards/xtensa/esp32/ttgo_lora_esp32/scripts/Make.defs b/boards/xtensa/esp32/ttgo_lora_esp32/scripts/Make.defs index dcb83e7168..315d3333ab 100644 --- a/boards/xtensa/esp32/ttgo_lora_esp32/scripts/Make.defs +++ b/boards/xtensa/esp32/ttgo_lora_esp32/scripts/Make.defs @@ -34,12 +34,10 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y) else ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld) - ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld) - else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld) - else + ifeq ($(CONFIG_ESP32_APP_FORMAT_LEGACY),y) ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld) + else + ARCHSCRIPT += $(call FINDSCRIPT,esp32_sections.ld) endif endif diff --git a/boards/xtensa/esp32/ttgo_t_display_esp32/scripts/Make.defs b/boards/xtensa/esp32/ttgo_t_display_esp32/scripts/Make.defs index f28e6213a8..a6cb1db5ca 100644 --- a/boards/xtensa/esp32/ttgo_t_display_esp32/scripts/Make.defs +++ b/boards/xtensa/esp32/ttgo_t_display_esp32/scripts/Make.defs @@ -34,12 +34,10 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y) else ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld) - ifeq ($(CONFIG_ESP32_APP_FORMAT_MCUBOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld) - else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld) - else + ifeq ($(CONFIG_ESP32_APP_FORMAT_LEGACY),y) ARCHSCRIPT += $(call FINDSCRIPT,legacy_sections.ld) + else + ARCHSCRIPT += $(call FINDSCRIPT,esp32_sections.ld) endif endif diff --git a/boards/xtensa/esp32s2/esp32s2-kaluga-1/scripts/Make.defs b/boards/xtensa/esp32s2/esp32s2-kaluga-1/scripts/Make.defs index 63700dae2d..3e03cc8b3d 100644 --- a/boards/xtensa/esp32s2/esp32s2-kaluga-1/scripts/Make.defs +++ b/boards/xtensa/esp32s2/esp32s2-kaluga-1/scripts/Make.defs @@ -32,12 +32,7 @@ ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32s2_peripherals.ld # pick the common linker scripts. ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld) - -ifeq ($(CONFIG_ESP32S2_APP_FORMAT_MCUBOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld) -else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld) -endif +ARCHSCRIPT += $(call FINDSCRIPT,esp32s2_sections.ld) ARCHPICFLAGS = -fpic diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/scripts/Make.defs b/boards/xtensa/esp32s2/esp32s2-saola-1/scripts/Make.defs index 236d052a97..414b2e74e5 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/scripts/Make.defs +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/scripts/Make.defs @@ -32,12 +32,7 @@ ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32s2_peripherals.ld # pick the common linker scripts. ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld) - -ifeq ($(CONFIG_ESP32S2_APP_FORMAT_MCUBOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld) -else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld) -endif +ARCHSCRIPT += $(call FINDSCRIPT,esp32s2_sections.ld) ARCHPICFLAGS = -fpic diff --git a/boards/xtensa/esp32s2/franzininho-wifi/scripts/Make.defs b/boards/xtensa/esp32s2/franzininho-wifi/scripts/Make.defs index 080041bfc1..e55715acc7 100644 --- a/boards/xtensa/esp32s2/franzininho-wifi/scripts/Make.defs +++ b/boards/xtensa/esp32s2/franzininho-wifi/scripts/Make.defs @@ -32,12 +32,8 @@ ARCHSCRIPT += $(BOARD_COMMON_DIR)$(DELIM)scripts$(DELIM)esp32s2_peripherals.ld # pick the common linker scripts. ARCHSCRIPT += $(call FINDSCRIPT,flat_memory.ld) +ARCHSCRIPT += $(call FINDSCRIPT,esp32s2_sections.ld) -ifeq ($(CONFIG_ESP32S2_APP_FORMAT_MCUBOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,mcuboot_sections.ld) -else ifeq ($(CONFIG_ESPRESSIF_SIMPLE_BOOT),y) - ARCHSCRIPT += $(call FINDSCRIPT,simple_boot_sections.ld) -endif ARCHPICFLAGS = -fpic
