git.openwrt.org Git - openwrt/staging/neocturne.git/blob

   1 From e84c8c3f444aae4359cd4d60fabd3d2145d011b5 Mon Sep 17 00:00:00 2001
   2 From: Abhimanyu Saini <abhimanyu.saini@nxp.com>
   3 Date: Fri, 24 Jun 2016 11:03:38 +0530
   4 Subject: [PATCH 61/93] ARMv8: freescale: Consolidate PPA flags under a single
   5  flag
   6
   7 [context adjustment]
   8
   9 LS1012A places PPA binary on QSPI flash instead of NOR.
  10 So, depricating CONFIG_SYS_LS_PPA_FW_IN_NOR in favour of
  11 CONFIG_SYS_LS_PPA_FW_IN_XIP to prevent fragmentation of code
  12 by addition of a new QSPI specific flag.
  13
  14 Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
  15 Signed-off-by: Abhimanyu Saini <abhimanyu.saini@nxp.com>
  16 Integrated-by: Jiang Yutang <yutang.jiang@nxp.com>
  17 ---
  18  arch/arm/cpu/armv8/fsl-layerscape/ppa.c |    4 ++--
  19  arch/arm/include/asm/fsl_secure_boot.h  |    2 +-
  20  include/configs/ls1043ardb.h            |    4 ++--
  21  3 files changed, 5 insertions(+), 5 deletions(-)
  22
  23 diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
  24 index 116e164..8986260 100644
  25 --- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
  26 +++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
  27 @@ -163,7 +163,7 @@ static int ppa_parse_firmware_fit_image(const void **raw_image_addr,
  28         void *ppa_addr;
  29         int ret;
  30
  31 -#ifdef CONFIG_SYS_LS_PPA_FW_IN_NOR
  32 +#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP
  33         ppa_addr = (void *)CONFIG_SYS_LS_PPA_FW_ADDR;
  34  #else
  35  #error "No CONFIG_SYS_LS_PPA_FW_IN_xxx defined"
  36 @@ -197,7 +197,7 @@ int sec_firmware_validate(void)
  37  {
  38         void *ppa_addr;
  39
  40 -#ifdef CONFIG_SYS_LS_PPA_FW_IN_NOR
  41 +#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP
  42         ppa_addr = (void *)CONFIG_SYS_LS_PPA_FW_ADDR;
  43  #else
  44  #error "No CONFIG_SYS_LS_PPA_FW_IN_xxx defined"
  45 diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h
  46 index c973255..b2e9105 100644
  47 --- a/arch/arm/include/asm/fsl_secure_boot.h
  48 +++ b/arch/arm/include/asm/fsl_secure_boot.h
  49 @@ -104,7 +104,7 @@
  50  #endif
  51
  52  #ifdef CONFIG_FSL_LS_PPA
  53 -#ifdef CONFIG_SYS_LS_PPA_FW_IN_NOR
  54 +#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP
  55  #ifdef CONFIG_LS1043A
  56  #define CONFIG_SYS_LS_PPA_ESBC_ADDR    0x600c0000
  57  #endif
  58 diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
  59 index af8b441..46818e8 100644
  60 --- a/include/configs/ls1043ardb.h
  61 +++ b/include/configs/ls1043ardb.h
  62 @@ -14,8 +14,8 @@
  63  #define CONFIG_ARMV8_PSCI
  64  #define CONFIG_SYS_LS_PPA_DRAM_BLOCK_MIN_SIZE          (1UL * 1024 * 1024)
  65
  66 -#define CONFIG_SYS_LS_PPA_FW_IN_NOR
  67 -#ifdef CONFIG_SYS_LS_PPA_FW_IN_NOR
  68 +#define CONFIG_SYS_LS_PPA_FW_IN_XIP
  69 +#ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP
  70  #define        CONFIG_SYS_LS_PPA_FW_ADDR       0x60500000
  71  #endif
  72  #endif
  73 --
  74 1.7.9.5
  75