aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mpc85xx
diff options
context:
space:
mode:
authorDavid Bauer <mail@david-bauer.net>2020-02-29 00:11:59 +0100
committerDavid Bauer <mail@david-bauer.net>2020-02-29 00:13:30 +0100
commitfc161063f55f1852dea4a1c41a0e4af3225b99cb (patch)
tree412806f74233d69cfbef0e5f24cec3d1cd1e6079 /target/linux/mpc85xx
parent1287bb48dc7295b56d4597a3789429da618a8ec7 (diff)
downloadupstream-fc161063f55f1852dea4a1c41a0e4af3225b99cb.tar.gz
upstream-fc161063f55f1852dea4a1c41a0e4af3225b99cb.tar.bz2
upstream-fc161063f55f1852dea4a1c41a0e4af3225b99cb.zip
mpc85xx: move NAND symbol to target config
All mpc85xx subtargets utilize NAND, thus enable NAND support target-wide. Fixes: 1287bb48dc72 ("mpc85xx: fix build with kernel 5.4") Signed-off-by: David Bauer <mail@david-bauer.net>
Diffstat (limited to 'target/linux/mpc85xx')
-rw-r--r--target/linux/mpc85xx/config-4.142
-rw-r--r--target/linux/mpc85xx/config-4.192
-rw-r--r--target/linux/mpc85xx/config-5.41
-rw-r--r--target/linux/mpc85xx/generic/config-default1
-rw-r--r--target/linux/mpc85xx/p1020/config-default1
-rw-r--r--target/linux/mpc85xx/p2020/config-default1
6 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/mpc85xx/config-4.14 b/target/linux/mpc85xx/config-4.14
index 479d6ee79f..dd80f2cdd7 100644
--- a/target/linux/mpc85xx/config-4.14
+++ b/target/linux/mpc85xx/config-4.14
@@ -211,6 +211,8 @@ CONFIG_MPIC_TIMER=y
CONFIG_MPILIB=y
# CONFIG_MTD_CFI is not set
CONFIG_MTD_M25P80=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_ECC=y
CONFIG_MTD_SPI_NOR=y
# CONFIG_MVME2500 is not set
# CONFIG_NEED_DMA_MAP_STATE is not set
diff --git a/target/linux/mpc85xx/config-4.19 b/target/linux/mpc85xx/config-4.19
index 6395ad72ff..ad21e576cc 100644
--- a/target/linux/mpc85xx/config-4.19
+++ b/target/linux/mpc85xx/config-4.19
@@ -197,6 +197,8 @@ CONFIG_MPIC_TIMER=y
CONFIG_MPILIB=y
# CONFIG_MTD_CFI is not set
CONFIG_MTD_M25P80=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_ECC=y
CONFIG_MTD_SPI_NOR=y
# CONFIG_MVME2500 is not set
CONFIG_NEED_PER_CPU_KM=y
diff --git a/target/linux/mpc85xx/config-5.4 b/target/linux/mpc85xx/config-5.4
index df4d741c27..811b7bc137 100644
--- a/target/linux/mpc85xx/config-5.4
+++ b/target/linux/mpc85xx/config-5.4
@@ -199,6 +199,7 @@ CONFIG_MPIC_TIMER=y
CONFIG_MPILIB=y
# CONFIG_MTD_CFI is not set
CONFIG_MTD_M25P80=y
+CONFIG_MTD_RAW_NAND=y
CONFIG_MTD_SPI_NOR=y
# CONFIG_MVME2500 is not set
CONFIG_NEED_PER_CPU_KM=y
diff --git a/target/linux/mpc85xx/generic/config-default b/target/linux/mpc85xx/generic/config-default
index 93ed5c5e55..9c4ccc3372 100644
--- a/target/linux/mpc85xx/generic/config-default
+++ b/target/linux/mpc85xx/generic/config-default
@@ -1,5 +1,4 @@
# CONFIG_FSL_CORENET_CF is not set
-CONFIG_MTD_RAW_NAND=y
CONFIG_MTD_NAND_FSL_IFC=y
CONFIG_MTD_SPLIT_FIRMWARE=y
CONFIG_MTD_SPLIT_TPLINK_FW=y
diff --git a/target/linux/mpc85xx/p1020/config-default b/target/linux/mpc85xx/p1020/config-default
index 00a02a8dc1..75dd2e3f69 100644
--- a/target/linux/mpc85xx/p1020/config-default
+++ b/target/linux/mpc85xx/p1020/config-default
@@ -19,7 +19,6 @@ CONFIG_LOCK_SPIN_ON_OWNER=y
CONFIG_MFD_CORE=y
CONFIG_MFD_MAX77620=y
CONFIG_MTD_CFI=y
-CONFIG_MTD_RAW_NAND=y
CONFIG_MTD_NAND_FSL_ELBC=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_SPLIT_FIRMWARE=y
diff --git a/target/linux/mpc85xx/p2020/config-default b/target/linux/mpc85xx/p2020/config-default
index 2369bbc7a6..be75f36814 100644
--- a/target/linux/mpc85xx/p2020/config-default
+++ b/target/linux/mpc85xx/p2020/config-default
@@ -7,7 +7,6 @@ CONFIG_HAVE_RCU_TABLE_FREE=y
CONFIG_LOCK_SPIN_ON_OWNER=y
CONFIG_MPC85xx_RDB=y
CONFIG_MTD_CFI=y
-CONFIG_MTD_RAW_NAND=y
CONFIG_MTD_NAND_BCH=y
CONFIG_MTD_NAND_ECC_BCH=y
CONFIG_MTD_NAND_FSL_ELBC=y