| Message ID | 1469791594-31150-1-git-send-email-Zhiqiang.Hou@nxp.com |
|---|---|
| State | Accepted |
| Commit | ab01ef5fa617444fd95543ee04ea53ccda273269 |
| Delegated to: | York Sun |
| Headers | show |
On 07/29/2016 04:37 AM, Zhiqiang Hou wrote: > From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > > 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> > --- > arch/arm/cpu/armv8/fsl-layerscape/ppa.c | 2 +- > include/configs/ls1043ardb.h | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > Applied to fsl-qoriq master, awaiting upstream. Thanks. York
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c index 541b251..f54ac3f 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c @@ -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" diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 44f86fa..857ad7b 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -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