mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-01 19:54:32 +02:00
Merge branch 'fix/fix_macro_in_memory_ld_v5.3' into 'release/v5.3'
fix(psram): fix macro in memory.ld (v5.3) See merge request espressif/esp-idf!34065
This commit is contained in:
@@ -19,12 +19,10 @@
|
|||||||
#define SRAM_SEG_END 0x4084E9A0 /* 2nd stage bootloader iram_loader_seg start address */
|
#define SRAM_SEG_END 0x4084E9A0 /* 2nd stage bootloader iram_loader_seg start address */
|
||||||
#define SRAM_SEG_SIZE SRAM_SEG_END - SRAM_SEG_START
|
#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
|
* IDRAM0_2_SEG_SIZE_DEFAULT is used when page size is 64KB
|
||||||
*/
|
*/
|
||||||
#define IDRAM0_2_SEG_SIZE (CONFIG_MMU_PAGE_SIZE << 8)
|
#define IDRAM0_2_SEG_SIZE (CONFIG_MMU_PAGE_SIZE << 8)
|
||||||
#endif
|
|
||||||
|
|
||||||
MEMORY
|
MEMORY
|
||||||
{
|
{
|
||||||
|
@@ -19,12 +19,10 @@
|
|||||||
#define SRAM_SEG_END 0x4084E5F0 /* 2nd stage bootloader iram_loader_seg start address */
|
#define SRAM_SEG_END 0x4084E5F0 /* 2nd stage bootloader iram_loader_seg start address */
|
||||||
#define SRAM_SEG_SIZE SRAM_SEG_END - SRAM_SEG_START
|
#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
|
* IDRAM0_2_SEG_SIZE_DEFAULT is used when page size is 64KB
|
||||||
*/
|
*/
|
||||||
#define IDRAM0_2_SEG_SIZE (CONFIG_MMU_PAGE_SIZE << 8)
|
#define IDRAM0_2_SEG_SIZE (CONFIG_MMU_PAGE_SIZE << 8)
|
||||||
#endif
|
|
||||||
|
|
||||||
MEMORY
|
MEMORY
|
||||||
{
|
{
|
||||||
|
@@ -26,10 +26,7 @@
|
|||||||
#define SRAM_HIGH_SIZE 0x80000 - CONFIG_CACHE_L2_CACHE_SIZE
|
#define SRAM_HIGH_SIZE 0x80000 - CONFIG_CACHE_L2_CACHE_SIZE
|
||||||
#define SRAM_HIGH_END SRAM_HIGH_START + SRAM_HIGH_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)
|
#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_ROM_DRAM_START 0x5010fa80 // Value taken from ROM elf, includes LP ROM stack
|
||||||
#define LP_RAM_END 0x50110000
|
#define LP_RAM_END 0x50110000
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
CONFIG_LOG_DEFAULT_LEVEL_NONE=y
|
||||||
CONFIG_APP_BUILD_TYPE_RAM=y
|
CONFIG_APP_BUILD_TYPE_RAM=y
|
||||||
CONFIG_VFS_SUPPORT_TERMIOS=n
|
CONFIG_VFS_SUPPORT_TERMIOS=n
|
||||||
CONFIG_NEWLIB_NANO_FORMAT=y
|
CONFIG_NEWLIB_NANO_FORMAT=y
|
||||||
|
Reference in New Issue
Block a user