diff options
| author | Etienne Carriere <etienne.carriere@linaro.org> | 2018-04-24 12:54:20 +0200 |
|---|---|---|
| committer | Jérôme Forissier <jerome.forissier@linaro.org> | 2018-04-25 18:26:18 +0200 |
| commit | f6bbec8edf2f8c8bb07d7e8ac94db733ce883c5a (patch) | |
| tree | 3bb2f8d023b9f6ac12e2cc432805f911cd45b0a5 /core/arch/arm/plat-zynq7k | |
| parent | 6f4e40abea22623e62dfba668f869db2cd01016a (diff) | |
core: remove CFG_ prefix from CFG_TEE_LOAD_ADDR
TEE_LOAD_ADDR is now local to source files. It is set to CFG_TEE_LOAD_ADDR
value if defined only for the platforms that previously allowed build
to override the value. Few platform did hardcod CFG_TEE_LOAD_ADDR, this
change preserve these configurations.
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Diffstat (limited to 'core/arch/arm/plat-zynq7k')
| -rw-r--r-- | core/arch/arm/plat-zynq7k/main.c | 2 | ||||
| -rw-r--r-- | core/arch/arm/plat-zynq7k/platform_config.h | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/core/arch/arm/plat-zynq7k/main.c b/core/arch/arm/plat-zynq7k/main.c index c6d6787e..d5afe44b 100644 --- a/core/arch/arm/plat-zynq7k/main.c +++ b/core/arch/arm/plat-zynq7k/main.c @@ -85,7 +85,7 @@ void plat_cpu_reset_late(void) /* primary core */ #if defined(CFG_BOOT_SECONDARY_REQUEST) /* set secondary entry address and release core */ - write32(CFG_TEE_LOAD_ADDR, SECONDARY_ENTRY_DROP); + write32(TEE_LOAD_ADDR, SECONDARY_ENTRY_DROP); dsb(); sev(); #endif diff --git a/core/arch/arm/plat-zynq7k/platform_config.h b/core/arch/arm/plat-zynq7k/platform_config.h index bac9a51c..9801bd8e 100644 --- a/core/arch/arm/plat-zynq7k/platform_config.h +++ b/core/arch/arm/plat-zynq7k/platform_config.h @@ -223,8 +223,10 @@ #define TEE_RAM_START TZSRAM_BASE -#ifndef CFG_TEE_LOAD_ADDR -#define CFG_TEE_LOAD_ADDR TZSRAM_BASE +#ifdef CFG_TEE_LOAD_ADDR +#define TEE_LOAD_ADDR CFG_TEE_LOAD_ADDR +#else +#define TEE_LOAD_ADDR TEE_RAM_START #endif #else /* CFG_WITH_PAGER */ @@ -268,8 +270,10 @@ #define TEE_RAM_START TZDRAM_BASE -#ifndef CFG_TEE_LOAD_ADDR -#define CFG_TEE_LOAD_ADDR TZDRAM_BASE +#ifdef CFG_TEE_LOAD_ADDR +#define TEE_LOAD_ADDR CFG_TEE_LOAD_ADDR +#else +#define TEE_LOAD_ADDR TEE_RAM_START #endif #endif /* CFG_WITH_PAGER */ |