From: Hou Zhiqiang <zhiqiang....@nxp.com>

Signed-off-by: Hou Zhiqiang <zhiqiang....@nxp.com>
---
 arch/arm/cpu/armv8/fsl-layerscape/Kconfig  | 29 +++++++++++++++++++++++++++++
 arch/arm/cpu/armv8/fsl-layerscape/Makefile |  2 +-
 include/configs/ls1043ardb.h               |  7 -------
 include/configs/ls1046ardb.h               |  7 -------
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig 
b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index 94ec8d5..952db19 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -44,6 +44,35 @@ config FSL_LSCH3
 menu "Layerscape architecture"
        depends on FSL_LSCH2 || FSL_LSCH3
 
+menu "Layerscape PPA"
+config FSL_LS_PPA
+       bool "FSL Layerscape PPA firmware support"
+       depends on ARCH_LS1043A || ARCH_LS1046A
+       select ARMV8_PSCI
+       select ARMV8_SEC_FIRMWARE_SUPPORT
+       select ARMV8_SEC_FIRMWARE_ERET_ADDR_REVERT
+       help
+         The FSL Primary Protected Application (PPA) is a software component
+         loaded during boot which runs in TrustZone and remains resident
+         after boot.
+choice
+       prompt "FSL Layerscape PPA firmware storage select"
+       depends on FSL_LS_PPA
+       default SYS_LS_PPA_FW_IN_XIP
+
+config SYS_LS_PPA_FW_IN_XIP
+       bool "XIP"
+
+endchoice
+
+config SYS_LS_PPA_FW_ADDR
+       hex "Address of PPA firmware"
+       depends on FSL_LS_PPA
+       default 0x60500000 if SYS_LS_PPA_FW_IN_XIP && NOR_BOOT
+       default 0x40500000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT
+
+endmenu
+
 config SYS_FSL_MMDC
        bool
 
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Makefile 
b/arch/arm/cpu/armv8/fsl-layerscape/Makefile
index 51c1cee..150eb7a 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/Makefile
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Makefile
@@ -10,7 +10,7 @@ obj-y += soc.o
 obj-$(CONFIG_MP) += mp.o
 obj-$(CONFIG_OF_LIBFDT) += fdt.o
 obj-$(CONFIG_SPL) += spl.o
-obj-$(CONFIG_FSL_LS_PPA) += ppa.o
+obj-$(CONFIG_$(SPL_)FSL_LS_PPA) += ppa.o
 
 ifneq ($(CONFIG_FSL_LSCH3),)
 obj-y += fsl_lsch3_speed.o
diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index 4b4d090..3023c48 100644
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -9,13 +9,6 @@
 
 #include "ls1043a_common.h"
 
-#if defined(CONFIG_FSL_LS_PPA)
-#define CONFIG_SYS_LS_PPA_FW_IN_XIP
-#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP
-#define        CONFIG_SYS_LS_PPA_FW_ADDR       0x60500000
-#endif
-#endif
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index 85a58b0..3ea02f0 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -9,13 +9,6 @@
 
 #include "ls1046a_common.h"
 
-#if defined(CONFIG_FSL_LS_PPA)
-#define CONFIG_SYS_LS_PPA_FW_IN_XIP
-#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP
-#define        CONFIG_SYS_LS_PPA_FW_ADDR       0x40500000
-#endif
-#endif
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
-- 
2.1.0.27.g96db324

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to