Merge branch 'fix/fix_macro_in_memory_ld' into 'master'

fix(psram): fix macro in memory.ld

Closes IDFCI-2382 and IDF-11133

See merge request espressif/esp-idf!33583

Author: Kainarx

components/esp_system/ld/esp32c5/memory.ld.in

@@ -19,12 +19,10 @@
 #define SRAM_SEG_END       0x4084E9A0  /* 2nd stage bootloader iram_loader_seg start address */
 #define SRAM_SEG_SIZE      SRAM_SEG_END - SRAM_SEG_START
 
-#if CONFIG_APP_BUILD_USE_FLASH_SECTIONS
 /*
  * IDRAM0_2_SEG_SIZE_DEFAULT is used when page size is 64KB
  */
 #define IDRAM0_2_SEG_SIZE   (CONFIG_MMU_PAGE_SIZE << 8)
-#endif
 
 MEMORY
 {

components/esp_system/ld/esp32c61/memory.ld.in

@@ -19,12 +19,10 @@
 #define SRAM_SEG_END       0x4083ea70  /* 2nd stage bootloader iram_loader_seg start address */
 #define SRAM_SEG_SIZE      SRAM_SEG_END - SRAM_SEG_START
 
-#if CONFIG_APP_BUILD_USE_FLASH_SECTIONS
 /*
  * IDRAM0_2_SEG_SIZE_DEFAULT is used when page size is 64KB
  */
 #define IDRAM0_2_SEG_SIZE   (CONFIG_MMU_PAGE_SIZE << 8)
-#endif
 
 MEMORY
 {

components/esp_system/ld/esp32p4/memory.ld.in

@@ -26,10 +26,7 @@
 #define SRAM_HIGH_SIZE     0x80000 - CONFIG_CACHE_L2_CACHE_SIZE
 #define SRAM_HIGH_END      SRAM_HIGH_START + SRAM_HIGH_SIZE
 
-
-#if CONFIG_APP_BUILD_USE_FLASH_SECTIONS
 #define IDROM_SEG_SIZE   (CONFIG_MMU_PAGE_SIZE << 10)
-#endif
 
 #define LP_ROM_DRAM_START 0x5010fa80 // Value taken from ROM elf, includes LP ROM stack
 #define LP_RAM_END        0x50110000

tools/test_apps/system/.build-test-rules.yml

@@ -45,9 +45,6 @@ tools/test_apps/system/gdb_loadable_elf:
     - if: IDF_TARGET == "esp32c6" or IDF_TARGET == "esp32h2"
       temporary: true
       reason: target esp32c6, esp32h2 is not supported yet
-    - if: IDF_TARGET == "esp32p4"
-      temporary: true
-      reason: build failed. IDF-11133
 
 tools/test_apps/system/longjmp_test:
   enable:

tools/test_apps/system/gdb_loadable_elf/README.md

@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C61 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | --------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C61 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | --------- | -------- | -------- | -------- |
 
 # Loadable ELF test application
 

tools/test_apps/system/gdb_loadable_elf/sdkconfig.defaults

@@ -1,3 +1,4 @@
+CONFIG_LOG_DEFAULT_LEVEL_NONE=y
 CONFIG_APP_BUILD_TYPE_RAM=y
 CONFIG_VFS_SUPPORT_TERMIOS=n
 CONFIG_NEWLIB_NANO_FORMAT=y