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>

diff --git a/target/linux/mpc85xx/config-4.14 b/target/linux/mpc85xx/config-4.14
index 479d6ee79faff1990599e18ea85a132807065b26..dd80f2cdd76aaa49788652a6c8e58667140f326b 100644 (file)
--- 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 6395ad72ff4df7975b9a01fb0044d1cc254e416d..ad21e576cc2acff39a29be0293bbf5498dfb83ed 100644 (file)
--- 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 df4d741c27e500d9fa44be01b536e9febc90306b..811b7bc13720a972bec9d6d867f0f0081f66dcf8 100644 (file)
--- 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 93ed5c5e55499c72b888e10ac6e8bd75d4946aab..9c4ccc3372fa779e3cd26993c081e03dc278398b 100644 (file)
--- 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 00a02a8dc10dbbb61d76eef1c978030afc749c81..75dd2e3f69a976435c2f22b51b5acdbb3205c0ae 100644 (file)
--- 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 2369bbc7a63dc8a4dd5ae69bce11f00d9eb5ff21..be75f3681420c2016f459c23cecc95ecbbb3bef1 100644 (file)
--- 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