package/boot/uboot-layerscape/patches/0083-armv8-fsl-layerscape-Fix-the-conflict-between-PPA-an.patch

   1 From db48271175c0566bb5e59776a23297d64aec9fcd Mon Sep 17 00:00:00 2001
   2 From: Alison Wang <b18965@freescale.com>
   3 Date: Thu, 21 Jul 2016 18:13:29 +0800
   4 Subject: [PATCH 83/93] armv8: fsl-layerscape: Fix the conflict between PPA
   5  and AArch32 support
   6
   7 As there is conflict between PPA and AArch32 support, this patch is to
   8 add a new defconfig for AArch32 support and move the definition for PPA
   9 to the board defconfig.
  10
  11 Signed-off-by: Alison Wang <alison.wang@nxp.com>
  12 ---
  13  configs/ls1012afrdm_aarch32_qspi_defconfig    |   11 +++++++++++
  14  configs/ls1012afrdm_qspi_defconfig            |    1 +
  15  configs/ls1012ardb_aarch32_qspi_defconfig     |   11 +++++++++++
  16  configs/ls1012ardb_qspi_SECURE_BOOT_defconfig |    1 +
  17  configs/ls1012ardb_qspi_defconfig             |    1 +
  18  include/configs/ls1012afrdm.h                 |    1 -
  19  include/configs/ls1012ardb.h                  |    1 -
  20  7 files changed, 25 insertions(+), 2 deletions(-)
  21  create mode 100644 configs/ls1012afrdm_aarch32_qspi_defconfig
  22  create mode 100644 configs/ls1012ardb_aarch32_qspi_defconfig
  23
  24 diff --git a/configs/ls1012afrdm_aarch32_qspi_defconfig b/configs/ls1012afrdm_aarch32_qspi_defconfig
  25 new file mode 100644
  26 index 0000000..1bb9080
  27 --- /dev/null
  28 +++ b/configs/ls1012afrdm_aarch32_qspi_defconfig
  29 @@ -0,0 +1,11 @@
  30 +CONFIG_ARM=y
  31 +CONFIG_TARGET_LS1012AFRDM=y
  32 +CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
  33 +# CONFIG_CMD_IMLS is not set
  34 +# CONFIG_FSL_LS_PPA is not set
  35 +CONFIG_SYS_NS16550=y
  36 +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-frdm"
  37 +CONFIG_OF_CONTROL=y
  38 +CONFIG_DM=y
  39 +CONFIG_SPI_FLASH=y
  40 +CONFIG_DM_SPI=y
  41 diff --git a/configs/ls1012afrdm_qspi_defconfig b/configs/ls1012afrdm_qspi_defconfig
  42 index e27181c..1f69db7 100644
  43 --- a/configs/ls1012afrdm_qspi_defconfig
  44 +++ b/configs/ls1012afrdm_qspi_defconfig
  45 @@ -2,6 +2,7 @@ CONFIG_ARM=y
  46  CONFIG_TARGET_LS1012AFRDM=y
  47  CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
  48  # CONFIG_CMD_IMLS is not set
  49 +CONFIG_FSL_LS_PPA=y
  50  CONFIG_SYS_NS16550=y
  51  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-frdm"
  52  CONFIG_OF_CONTROL=y
  53 diff --git a/configs/ls1012ardb_aarch32_qspi_defconfig b/configs/ls1012ardb_aarch32_qspi_defconfig
  54 new file mode 100644
  55 index 0000000..df16f3b
  56 --- /dev/null
  57 +++ b/configs/ls1012ardb_aarch32_qspi_defconfig
  58 @@ -0,0 +1,11 @@
  59 +CONFIG_ARM=y
  60 +CONFIG_TARGET_LS1012ARDB=y
  61 +CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
  62 +# CONFIG_CMD_IMLS is not set
  63 +# CONFIG_FSL_LS_PPA is not set
  64 +CONFIG_SYS_NS16550=y
  65 +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb"
  66 +CONFIG_OF_CONTROL=y
  67 +CONFIG_DM=y
  68 +CONFIG_SPI_FLASH=y
  69 +CONFIG_DM_SPI=y
  70 diff --git a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
  71 index 92a95a8..4091503 100644
  72 --- a/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
  73 +++ b/configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
  74 @@ -2,6 +2,7 @@ CONFIG_ARM=y
  75  CONFIG_TARGET_LS1012ARDB=y
  76  CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT,SECURE_BOOT"
  77  # CONFIG_CMD_IMLS is not set
  78 +# CONFIG_FSL_LS_PPA is not set
  79  CONFIG_SYS_NS16550=y
  80  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb"
  81  CONFIG_OF_CONTROL=y
  82 diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig
  83 index f819038..e025247 100644
  84 --- a/configs/ls1012ardb_qspi_defconfig
  85 +++ b/configs/ls1012ardb_qspi_defconfig
  86 @@ -2,6 +2,7 @@ CONFIG_ARM=y
  87  CONFIG_TARGET_LS1012ARDB=y
  88  CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
  89  # CONFIG_CMD_IMLS is not set
  90 +CONFIG_FSL_LS_PPA=y
  91  CONFIG_SYS_NS16550=y
  92  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb"
  93  CONFIG_OF_CONTROL=y
  94 diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h
  95 index 0e35fe9..a736687 100644
  96 --- a/include/configs/ls1012afrdm.h
  97 +++ b/include/configs/ls1012afrdm.h
  98 @@ -10,7 +10,6 @@
  99  #include "ls1012a_common.h"
 100
 101  #ifndef CONFIG_SECURE_BOOT
 102 -#define CONFIG_FSL_LS_PPA
 103  #if defined(CONFIG_FSL_LS_PPA)
 104  #define CONFIG_ARMV8_PSCI
 105  #define CONFIG_SYS_LS_PPA_DRAM_BLOCK_MIN_SIZE  (1UL * 1024 * 1024)
 106 diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
 107 index d78edd2..400fa61 100644
 108 --- a/include/configs/ls1012ardb.h
 109 +++ b/include/configs/ls1012ardb.h
 110 @@ -9,7 +9,6 @@
 111
 112  #include "ls1012a_common.h"
 113
 114 -#define CONFIG_FSL_LS_PPA
 115  #if defined(CONFIG_FSL_LS_PPA)
 116  #define CONFIG_ARMV8_PSCI
 117  #define CONFIG_SYS_LS_PPA_DRAM_BLOCK_MIN_SIZE          (1UL * 1024 * 1024)
 118 --
 119 1.7.9.5
 120