From 04c7bbde5e834e1e6d7f3a06a1ea0a148ea2d532 Mon Sep 17 00:00:00 2001 From: Chen Jichang Date: Wed, 18 Sep 2024 13:30:02 +0800 Subject: [PATCH] fix(psram): fix macro in memory.ld --- components/esp_system/ld/esp32c5/mp/memory.ld.in | 2 -- components/esp_system/ld/esp32c61/memory.ld.in | 2 -- components/esp_system/ld/esp32p4/memory.ld.in | 3 --- 3 files changed, 7 deletions(-) diff --git a/components/esp_system/ld/esp32c5/mp/memory.ld.in b/components/esp_system/ld/esp32c5/mp/memory.ld.in index 1e5cf0de67..0d11cc06b5 100644 --- a/components/esp_system/ld/esp32c5/mp/memory.ld.in +++ b/components/esp_system/ld/esp32c5/mp/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 { diff --git a/components/esp_system/ld/esp32c61/memory.ld.in b/components/esp_system/ld/esp32c61/memory.ld.in index 8b67f377ea..59694577d2 100644 --- a/components/esp_system/ld/esp32c61/memory.ld.in +++ b/components/esp_system/ld/esp32c61/memory.ld.in @@ -19,12 +19,10 @@ #define SRAM_SEG_END 0x4084E5F0 /* 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 { diff --git a/components/esp_system/ld/esp32p4/memory.ld.in b/components/esp_system/ld/esp32p4/memory.ld.in index 226803c293..bad8512136 100644 --- a/components/esp_system/ld/esp32p4/memory.ld.in +++ b/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