diff options
| author | Chris Kay <chris.kay@arm.com> | 2020-05-29 17:22:20 +0100 |
|---|---|---|
| committer | Chris Kay <chris@cjkay.com> | 2020-06-05 19:16:35 +0100 |
| commit | 3ab870aa6db6dd543a8ef3d4f3cdb94b805a2e59 (patch) | |
| tree | 0a39e1922625f6468cc72e47416626a3f40fcf13 | |
| parent | 17e35222b49a2ad4475669a6aec807a6e6edf95f (diff) | |
arch: Do not create `FMW_`-prefixed definitions
The `FMW_` prefix is reserved for use by the firmware. The architecture
library must use `ARCH_`.
Change-Id: Ibbecede598b4fccd32050a9733fc7c324ca5abae
Signed-off-by: Chris Kay <chris.kay@arm.com>
| -rw-r--r-- | arch/src/armv7-m/scatter.S | 30 | ||||
| -rw-r--r-- | arch/src/armv7-m/scatter.h | 4 |
2 files changed, 17 insertions, 17 deletions
diff --git a/arch/src/armv7-m/scatter.S b/arch/src/armv7-m/scatter.S index 2a472123..1a509921 100644 --- a/arch/src/armv7-m/scatter.S +++ b/arch/src/armv7-m/scatter.S @@ -19,9 +19,9 @@ * - Executable sections */ -# define FMW_X_BASE +0 -# define FMW_R_BASE +0 -# define FMW_W_BASE +0 +# define ARCH_X_BASE +0 +# define ARCH_R_BASE +0 +# define ARCH_W_BASE +0 #elif FMW_MEM_MODE == FWK_MEM_MODE_DUAL_REGION_RELOCATION /* * Dual region memory layout with initialized data relocation: @@ -33,10 +33,10 @@ * - Read-write sections */ -# define FMW_X_BASE +0 -# define FMW_R_BASE +0 +# define ARCH_X_BASE +0 +# define ARCH_R_BASE +0 -# define FMW_W_BASE FMW_MEM1_BASE +# define ARCH_W_BASE FMW_MEM1_BASE #elif FMW_MEM_MODE == FWK_MEM_MODE_DUAL_REGION_NO_RELOCATION /* * Dual region memory layout without initialized data relocation: @@ -48,20 +48,20 @@ * - Read-write sections */ -# define FMW_X_BASE +0 +# define ARCH_X_BASE +0 -# define FMW_R_BASE FMW_MEM1_BASE -# define FMW_W_BASE +0 +# define ARCH_R_BASE FMW_MEM1_BASE +# define ARCH_W_BASE +0 #endif #if FMW_MEM_MODE == FWK_MEM_MODE_SINGLE_REGION -# define FMW_W_LIMIT FMW_MEM0_LIMIT +# define ARCH_W_LIMIT ARCH_MEM0_LIMIT #else -# define FMW_W_LIMIT FMW_MEM1_LIMIT +# define ARCH_W_LIMIT ARCH_MEM1_LIMIT #endif LR_FIRMWARE FMW_MEM0_BASE { - ER_EXCEPTIONS FMW_X_BASE { + ER_EXCEPTIONS ARCH_X_BASE { *(.exceptions) } @@ -69,11 +69,11 @@ LR_FIRMWARE FMW_MEM0_BASE { *(+CODE) } - ER_RODATA FMW_R_BASE { + ER_RODATA ARCH_R_BASE { *(+CONST) } - ER_DATA FMW_W_BASE { + ER_DATA ARCH_W_BASE { *(+DATA) } @@ -81,5 +81,5 @@ LR_FIRMWARE FMW_MEM0_BASE { *(+BSS) } - ARM_LIB_STACKHEAP +0 EMPTY (FMW_W_LIMIT - +0) { } + ARM_LIB_STACKHEAP +0 EMPTY (ARCH_W_LIMIT - +0) { } } diff --git a/arch/src/armv7-m/scatter.h b/arch/src/armv7-m/scatter.h index df0ec6c2..0c3058db 100644 --- a/arch/src/armv7-m/scatter.h +++ b/arch/src/armv7-m/scatter.h @@ -55,7 +55,7 @@ # error "FMW_MEM0_SIZE has not been configured" #endif -#define FMW_MEM0_LIMIT (FMW_MEM0_BASE + FMW_MEM0_SIZE) +#define ARCH_MEM0_LIMIT (FMW_MEM0_BASE + FMW_MEM0_SIZE) #if FMW_MEM_MODE != FWK_MEM_MODE_SINGLE_REGION # ifndef FMW_MEM1_BASE @@ -66,5 +66,5 @@ # error "FMW_MEM1_SIZE has not been configured" # endif -# define FMW_MEM1_LIMIT (FMW_MEM1_BASE + FMW_MEM1_SIZE) +# define ARCH_MEM1_LIMIT (FMW_MEM1_BASE + FMW_MEM1_SIZE) #endif |