62fc1b83acd99489c94bc9634d6b5d7f893789ed
[openwrt/staging/linusw.git] /
1 From da79bd42be7226c6db58b21b1fed595587d8dcaa Mon Sep 17 00:00:00 2001
2 From: Yutang Jiang <yutang.jiang@nxp.com>
3 Date: Tue, 18 Oct 2016 18:44:23 +0800
4 Subject: [PATCH 91/93] armv8: fsl-layerscape: ls1012ardb: configs: disable
5 FSL_LS_PPA and remove aarch32 config
6
7 Signed-off-by: Yutang Jiang <yutang.jiang@nxp.com>
8 ---
9 configs/ls1012ardb_aarch32_qspi_defconfig | 11 -----------
10 configs/ls1012ardb_qspi_defconfig | 3 ++-
11 2 files changed, 2 insertions(+), 12 deletions(-)
12 delete mode 100644 configs/ls1012ardb_aarch32_qspi_defconfig
13
14 diff --git a/configs/ls1012ardb_aarch32_qspi_defconfig b/configs/ls1012ardb_aarch32_qspi_defconfig
15 deleted file mode 100644
16 index df16f3b..0000000
17 --- a/configs/ls1012ardb_aarch32_qspi_defconfig
18 +++ /dev/null
19 @@ -1,11 +0,0 @@
20 -CONFIG_ARM=y
21 -CONFIG_TARGET_LS1012ARDB=y
22 -CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
23 -# CONFIG_CMD_IMLS is not set
24 -# CONFIG_FSL_LS_PPA is not set
25 -CONFIG_SYS_NS16550=y
26 -CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb"
27 -CONFIG_OF_CONTROL=y
28 -CONFIG_DM=y
29 -CONFIG_SPI_FLASH=y
30 -CONFIG_DM_SPI=y
31 diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig
32 index 00e4dd2..df16f3b 100644
33 --- a/configs/ls1012ardb_qspi_defconfig
34 +++ b/configs/ls1012ardb_qspi_defconfig
35 @@ -1,7 +1,8 @@
36 CONFIG_ARM=y
37 CONFIG_TARGET_LS1012ARDB=y
38 -CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT, FSL_LS_PPA"
39 +CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
40 # CONFIG_CMD_IMLS is not set
41 +# CONFIG_FSL_LS_PPA is not set
42 CONFIG_SYS_NS16550=y
43 CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb"
44 CONFIG_OF_CONTROL=y
45 --
46 1.7.9.5
47