From: Yangbo Lu <yangbo.lu@nxp.com>
Date: Fri, 10 Apr 2020 06:52:49 +0000 (+0800)
Subject: layerscape: re-enable IFC NAND/NOR controllers in config-5.4
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7a08169dc19c3ebf22d255b4b9fa909f03c92964;p=openwrt%2Fstaging%2Fblocktrron.git

layerscape: re-enable IFC NAND/NOR controllers in config-5.4

The Freescale IFC NAND/NOR controllers options were disabled
in default in previous running make kernel_oldconfig.
So re-enable them.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
---

diff --git a/target/linux/layerscape/armv7/config-5.4 b/target/linux/layerscape/armv7/config-5.4
index dedcb29eac..d2f38e9b00 100644
--- a/target/linux/layerscape/armv7/config-5.4
+++ b/target/linux/layerscape/armv7/config-5.4
@@ -267,6 +267,7 @@ CONFIG_FREEZER=y
 CONFIG_FSL_EDMA=y
 # CONFIG_FSL_EDMA_V3 is not set
 CONFIG_FSL_GUTS=y
+CONFIG_FSL_IFC=y
 # CONFIG_FSL_IMX8_DDR_PMU is not set
 # CONFIG_FSL_PPFE is not set
 CONFIG_FSL_PQ_MDIO=y
@@ -478,6 +479,11 @@ CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_DATAFLASH=y
 # CONFIG_MTD_DATAFLASH_OTP is not set
 # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+CONFIG_MTD_NAND_CORE=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+CONFIG_MTD_NAND_FSL_IFC=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_MTD_SST25L=y
diff --git a/target/linux/layerscape/armv8_64b/config-5.4 b/target/linux/layerscape/armv8_64b/config-5.4
index 8503e31e92..9a2cf63833 100644
--- a/target/linux/layerscape/armv8_64b/config-5.4
+++ b/target/linux/layerscape/armv8_64b/config-5.4
@@ -366,6 +366,7 @@ CONFIG_FSL_ERRATUM_A008585=y
 CONFIG_FSL_FM_MAX_FRAME_SIZE=1522
 CONFIG_FSL_FM_RX_EXTRA_HEADROOM=64
 CONFIG_FSL_GUTS=y
+CONFIG_FSL_IFC=y
 CONFIG_FSL_MC_BUS=y
 CONFIG_FSL_MC_DPIO=y
 CONFIG_FSL_MC_UAPI_SUPPORT=y
@@ -663,6 +664,11 @@ CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_DATAFLASH=y
 # CONFIG_MTD_DATAFLASH_OTP is not set
 # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+CONFIG_MTD_NAND_CORE=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+CONFIG_MTD_NAND_FSL_IFC=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=16384