فهرست منبع

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 <[email protected]>
David Bauer 5 سال پیش
والد
کامیت
fc161063f5

+ 2 - 0
target/linux/mpc85xx/config-4.14

@@ -211,6 +211,8 @@ CONFIG_MPIC_TIMER=y
 CONFIG_MPILIB=y
 CONFIG_MPILIB=y
 # CONFIG_MTD_CFI is not set
 # CONFIG_MTD_CFI is not set
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_M25P80=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPI_NOR=y
 # CONFIG_MVME2500 is not set
 # CONFIG_MVME2500 is not set
 # CONFIG_NEED_DMA_MAP_STATE is not set
 # CONFIG_NEED_DMA_MAP_STATE is not set

+ 2 - 0
target/linux/mpc85xx/config-4.19

@@ -197,6 +197,8 @@ CONFIG_MPIC_TIMER=y
 CONFIG_MPILIB=y
 CONFIG_MPILIB=y
 # CONFIG_MTD_CFI is not set
 # CONFIG_MTD_CFI is not set
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_M25P80=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPI_NOR=y
 # CONFIG_MVME2500 is not set
 # CONFIG_MVME2500 is not set
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NEED_PER_CPU_KM=y

+ 1 - 0
target/linux/mpc85xx/config-5.4

@@ -199,6 +199,7 @@ CONFIG_MPIC_TIMER=y
 CONFIG_MPILIB=y
 CONFIG_MPILIB=y
 # CONFIG_MTD_CFI is not set
 # CONFIG_MTD_CFI is not set
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_M25P80=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPI_NOR=y
 # CONFIG_MVME2500 is not set
 # CONFIG_MVME2500 is not set
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NEED_PER_CPU_KM=y

+ 0 - 1
target/linux/mpc85xx/generic/config-default

@@ -1,5 +1,4 @@
 # CONFIG_FSL_CORENET_CF is not set
 # CONFIG_FSL_CORENET_CF is not set
-CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NAND_FSL_IFC=y
 CONFIG_MTD_NAND_FSL_IFC=y
 CONFIG_MTD_SPLIT_FIRMWARE=y
 CONFIG_MTD_SPLIT_FIRMWARE=y
 CONFIG_MTD_SPLIT_TPLINK_FW=y
 CONFIG_MTD_SPLIT_TPLINK_FW=y

+ 0 - 1
target/linux/mpc85xx/p1020/config-default

@@ -19,7 +19,6 @@ CONFIG_LOCK_SPIN_ON_OWNER=y
 CONFIG_MFD_CORE=y
 CONFIG_MFD_CORE=y
 CONFIG_MFD_MAX77620=y
 CONFIG_MFD_MAX77620=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI=y
-CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NAND_FSL_ELBC=y
 CONFIG_MTD_NAND_FSL_ELBC=y
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_SPLIT_FIRMWARE=y
 CONFIG_MTD_SPLIT_FIRMWARE=y

+ 0 - 1
target/linux/mpc85xx/p2020/config-default

@@ -7,7 +7,6 @@ CONFIG_HAVE_RCU_TABLE_FREE=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
 CONFIG_MPC85xx_RDB=y
 CONFIG_MPC85xx_RDB=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI=y
-CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NAND_BCH=y
 CONFIG_MTD_NAND_BCH=y
 CONFIG_MTD_NAND_ECC_BCH=y
 CONFIG_MTD_NAND_ECC_BCH=y
 CONFIG_MTD_NAND_FSL_ELBC=y
 CONFIG_MTD_NAND_FSL_ELBC=y