Skip to content

Commit ab7e95c

Browse files
committed
arm64: rename default RAM region from 'SRAM' to 'RAM'
As with 32-bit ARM, it is useful to make the RAMABLE_REGION name uniform across architectures so the build system does not need to be aware of the differences when CODE_DATA_RELOCATION is supported. Generalize the name to just 'RAM' for uniformity. Signed-off-by: Peter Marheine <[email protected]>
1 parent 6884aa1 commit ab7e95c

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

include/zephyr/arch/arm64/scripts/linker.ld

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@
2020
/* physical address of RAM */
2121
#ifdef CONFIG_XIP
2222
#define ROMABLE_REGION FLASH
23-
#define RAMABLE_REGION SRAM
2423
#else
25-
#define ROMABLE_REGION SRAM
26-
#define RAMABLE_REGION SRAM
24+
#define ROMABLE_REGION RAM
2725
#endif
26+
#define RAMABLE_REGION RAM
2827

2928
#if !defined(CONFIG_XIP) && (CONFIG_FLASH_SIZE == 0)
3029
#define ROM_ADDR RAM_ADDR
@@ -60,7 +59,7 @@
6059
MEMORY
6160
{
6261
FLASH (rx) : ORIGIN = ROM_ADDR, LENGTH = ROM_SIZE
63-
SRAM (wx) : ORIGIN = RAM_ADDR, LENGTH = RAM_SIZE
62+
RAM (wx) : ORIGIN = RAM_ADDR, LENGTH = RAM_SIZE
6463
/* Used by and documented in include/linker/intlist.ld */
6564
IDT_LIST (wx) : ORIGIN = 0xFFFFF7FF, LENGTH = 2K
6665
}
@@ -203,7 +202,7 @@ SECTIONS
203202
GROUP_START(RAMABLE_REGION)
204203

205204
. = RAM_ADDR;
206-
/* Align the start of image SRAM with the
205+
/* Align the start of image RAM with the
207206
* minimum granularity required by MMU.
208207
*/
209208
. = ALIGN(_region_min_align);

0 commit comments

Comments
 (0)