diff options
Diffstat (limited to 'package/boot/uboot-layerscape/patches/0061-ARMv8-freescale-Consolidate-PPA-flags-under-a-single.patch')
| -rw-r--r-- | package/boot/uboot-layerscape/patches/0061-ARMv8-freescale-Consolidate-PPA-flags-under-a-single.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/package/boot/uboot-layerscape/patches/0061-ARMv8-freescale-Consolidate-PPA-flags-under-a-single.patch b/package/boot/uboot-layerscape/patches/0061-ARMv8-freescale-Consolidate-PPA-flags-under-a-single.patch new file mode 100644 index 0000000000..9f47de9dbf --- /dev/null +++ b/package/boot/uboot-layerscape/patches/0061-ARMv8-freescale-Consolidate-PPA-flags-under-a-single.patch @@ -0,0 +1,75 @@ +From e84c8c3f444aae4359cd4d60fabd3d2145d011b5 Mon Sep 17 00:00:00 2001 +From: Abhimanyu Saini <abhimanyu.saini@nxp.com> +Date: Fri, 24 Jun 2016 11:03:38 +0530 +Subject: [PATCH 61/93] ARMv8: freescale: Consolidate PPA flags under a single + flag + +[context adjustment] + +LS1012A places PPA binary on QSPI flash instead of NOR. +So, depricating 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> +Integrated-by: Jiang Yutang <yutang.jiang@nxp.com> +--- + arch/arm/cpu/armv8/fsl-layerscape/ppa.c | 4 ++-- + arch/arm/include/asm/fsl_secure_boot.h | 2 +- + include/configs/ls1043ardb.h | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c +index 116e164..8986260 100644 +--- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c ++++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c +@@ -163,7 +163,7 @@ static int ppa_parse_firmware_fit_image(const void **raw_image_addr, + void *ppa_addr; + int ret; + +-#ifdef CONFIG_SYS_LS_PPA_FW_IN_NOR ++#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP + ppa_addr = (void *)CONFIG_SYS_LS_PPA_FW_ADDR; + #else + #error "No CONFIG_SYS_LS_PPA_FW_IN_xxx defined" +@@ -197,7 +197,7 @@ int sec_firmware_validate(void) + { + void *ppa_addr; + +-#ifdef CONFIG_SYS_LS_PPA_FW_IN_NOR ++#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP + ppa_addr = (void *)CONFIG_SYS_LS_PPA_FW_ADDR; + #else + #error "No CONFIG_SYS_LS_PPA_FW_IN_xxx defined" +diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h +index c973255..b2e9105 100644 +--- a/arch/arm/include/asm/fsl_secure_boot.h ++++ b/arch/arm/include/asm/fsl_secure_boot.h +@@ -104,7 +104,7 @@ + #endif + + #ifdef CONFIG_FSL_LS_PPA +-#ifdef CONFIG_SYS_LS_PPA_FW_IN_NOR ++#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP + #ifdef CONFIG_LS1043A + #define CONFIG_SYS_LS_PPA_ESBC_ADDR 0x600c0000 + #endif +diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h +index af8b441..46818e8 100644 +--- a/include/configs/ls1043ardb.h ++++ b/include/configs/ls1043ardb.h +@@ -14,8 +14,8 @@ + #define CONFIG_ARMV8_PSCI + #define CONFIG_SYS_LS_PPA_DRAM_BLOCK_MIN_SIZE (1UL * 1024 * 1024) + +-#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 +-- +1.7.9.5 + |