diff options
author | Tom Rini <trini@konsulko.com> | 2016-12-16 17:46:36 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-12-16 17:46:36 (GMT) |
commit | b5178a1f2468d5e9b1066e7d08757c1164727e4c (patch) | |
tree | 59ba300f55720cc86874c2ad25646ec09a9f2675 /arch/arm/cpu/armv8/cpu-dt.c | |
parent | be72591bcd644df7e16afdd12ec258693693422f (diff) | |
parent | c151cb5b516e609a0846bd392d6207a77b66a7ff (diff) | |
download | u-boot-b5178a1f2468d5e9b1066e7d08757c1164727e4c.tar.xz |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'arch/arm/cpu/armv8/cpu-dt.c')
-rw-r--r-- | arch/arm/cpu/armv8/cpu-dt.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv8/cpu-dt.c b/arch/arm/cpu/armv8/cpu-dt.c index 9ffb49c..3a5afe8 100644 --- a/arch/arm/cpu/armv8/cpu-dt.c +++ b/arch/arm/cpu/armv8/cpu-dt.c @@ -6,6 +6,7 @@ #include <common.h> #include <asm/psci.h> +#include <asm/system.h> #ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT #include <asm/armv8/sec_firmware.h> #endif @@ -13,7 +14,8 @@ int psci_update_dt(void *fdt) { #ifdef CONFIG_MP -#if defined(CONFIG_ARMV8_PSCI) +#if defined(CONFIG_ARMV8_PSCI) || defined(CONFIG_FSL_PPA_ARMV8_PSCI) + #ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT /* * If the PSCI in SEC Firmware didn't work, avoid to update the @@ -25,6 +27,13 @@ int psci_update_dt(void *fdt) return 0; #endif fdt_psci(fdt); + +#if defined(CONFIG_ARMV8_PSCI) && !defined(CONFIG_ARMV8_SECURE_BASE) + /* secure code lives in RAM, keep it alive */ + fdt_add_mem_rsv(fdt, (unsigned long)__secure_start, + __secure_end - __secure_start); +#endif + #endif #endif return 0; |