]> git.sur5r.net Git - u-boot/commitdiff
ARMv8/fsl-ppa: Consolidate PPA image stored-media flag for XIP
authorHou Zhiqiang <Zhiqiang.Hou@nxp.com>
Fri, 29 Jul 2016 11:26:34 +0000 (19:26 +0800)
committerYork Sun <york.sun@nxp.com>
Tue, 2 Aug 2016 16:51:29 +0000 (09:51 -0700)
The PPA binary may be stored on QSPI flash instead of NOR.
So, deprecated CONFIG_SYS_LS_PPA_FW_IN_NOR in favour of
CONFIG_SYS_LS_PPA_FW_IN_XIP to prevent fragmentation of code
by addition of a new QSPI specific flag.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Signed-off-by: Abhimanyu Saini <abhimanyu.saini@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
arch/arm/cpu/armv8/fsl-layerscape/ppa.c
include/configs/ls1043ardb.h

index 541b251bf4a955e25b7f9e5a212a4589b754d16f..f54ac3f431e58f0ee293fbe59a7c2415e5e820ff 100644 (file)
@@ -24,7 +24,7 @@ int ppa_init(void)
        u32 *boot_loc_ptr_l, *boot_loc_ptr_h;
        int ret;
 
-#ifdef CONFIG_SYS_LS_PPA_FW_IN_NOR
+#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP
        ppa_fit_addr = (void *)CONFIG_SYS_LS_PPA_FW_ADDR;
 #else
 #error "No CONFIG_SYS_LS_PPA_FW_IN_xxx defined"
index 44f86fabd5e46dbbce4cf88645c3166e44b26f82..857ad7b6cc0a67863f7b994863b32e5e87d33fd8 100644 (file)
@@ -14,8 +14,8 @@
 #define SEC_FIRMWARE_ERET_ADDR_REVERT
 #define CONFIG_ARMV8_PSCI
 
-#define CONFIG_SYS_LS_PPA_FW_IN_NOR
-#ifdef CONFIG_SYS_LS_PPA_FW_IN_NOR
+#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