diff options
| author | Ruchika Gupta <ruchika.gupta@nxp.com> | 2017-08-17 03:40:29 (GMT) |
|---|---|---|
| committer | Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> | 2017-08-21 04:42:29 (GMT) |
| commit | 4a53a44e9ed8d29f2b68864108090a8a4bce05d8 (patch) | |
| tree | b601ae80289d3402c86a8a66443bbfa2a7f036e6 /arch/arm | |
| parent | 4db892299ccbf96c72b42d4d3f377b56c5500525 (diff) | |
| download | u-boot-4a53a44e9ed8d29f2b68864108090a8a4bce05d8.tar.xz | |
armv8/fsl-layerscape: fdt Update kaslr_seed only if sec_firmware is available
Signed-off-by: Ruchika Gupta <ruchika.gupta@nxp.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c index 7f58dbb..cd0ea22 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c @@ -345,6 +345,7 @@ static void fdt_fixup_msi(void *blob) } #endif +#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT /* Remove JR node used by SEC firmware */ void fdt_fixup_remove_jr(void *blob) { @@ -370,6 +371,7 @@ void fdt_fixup_remove_jr(void *blob) "fsl,sec-v4.0-job-ring"); } } +#endif void ft_cpu_setup(void *blob, bd_t *bd) { @@ -382,9 +384,10 @@ void ft_cpu_setup(void *blob, bd_t *bd) #if CONFIG_SYS_FSL_SEC_COMPAT >= 4 else { ccsr_sec_t __iomem *sec; - +#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT if (fdt_fixup_kaslr(blob)) fdt_fixup_remove_jr(blob); +#endif sec = (void __iomem *)CONFIG_SYS_FSL_SEC_ADDR; fdt_fixup_crypto_node(blob, sec_in32(&sec->secvid_ms)); |