From 110c9e9034736d0302359de1eadd8b363dead4a7 Mon Sep 17 00:00:00 2001
From: Yangbo Lu <yangbo.lu@nxp.com>
Date: Wed, 1 Nov 2017 17:52:10 +0800
Subject: [PATCH] layerscape: update config-4.9

Some new options were introduced by kernel patches.
And some options should be removed/added.
The config-4.9 should be updated accordingly.

Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
---
 target/linux/layerscape/armv8_32b/config-4.9 | 9 +++++++--
 target/linux/layerscape/armv8_64b/config-4.9 | 7 +++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/target/linux/layerscape/armv8_32b/config-4.9 b/target/linux/layerscape/armv8_32b/config-4.9
index 565cb5d9df..55355d9df0 100644
--- a/target/linux/layerscape/armv8_32b/config-4.9
+++ b/target/linux/layerscape/armv8_32b/config-4.9
@@ -448,6 +448,9 @@ CONFIG_FSL_EDMA=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_PPFE=y
+CONFIG_FSL_PPFE_UTIL_DISABLED=y
 CONFIG_FSL_PQ_MDIO=y
 # CONFIG_FSL_QDMA is not set
 CONFIG_FSL_QMAN_CI_SCHED_CFG_BMAN_W=2
@@ -689,7 +692,6 @@ CONFIG_IRQ_WORK=y
 # CONFIG_ISDN is not set
 CONFIG_ISL29003=y
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
 CONFIG_KALLSYMS=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
@@ -728,6 +730,8 @@ CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_CLUT224=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LS_SCFG_MSI=y
+# CONFIG_LS_SOC_DRIVERS is not set
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_MACB=y
@@ -839,6 +843,7 @@ CONFIG_MTD_NAND_BRCMNAND=y
 CONFIG_MTD_NAND_DENALI=y
 CONFIG_MTD_NAND_DENALI_DT=y
 CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_FSL_IFC=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=16384
@@ -1165,7 +1170,7 @@ CONFIG_SOC_HAS_REALTIME_COUNTER=y
 # CONFIG_SOC_IMX6SX is not set
 # CONFIG_SOC_IMX6UL is not set
 # CONFIG_SOC_IMX7D is not set
-# CONFIG_SOC_LS1021A is not set
+CONFIG_SOC_LS1021A=y
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_OMAP5=y
 CONFIG_SOC_TI81XX=y
diff --git a/target/linux/layerscape/armv8_64b/config-4.9 b/target/linux/layerscape/armv8_64b/config-4.9
index 4432919f4e..7519463d99 100644
--- a/target/linux/layerscape/armv8_64b/config-4.9
+++ b/target/linux/layerscape/armv8_64b/config-4.9
@@ -106,6 +106,7 @@ CONFIG_ARM_SP805_WATCHDOG=y
 CONFIG_ARM_TIMER_SP804=y
 CONFIG_ASN1=y
 CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_ASYNC_CORE=y
 CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 CONFIG_ATA=y
 CONFIG_ATA_ACPI=y
@@ -268,12 +269,13 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI=y
 # CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_DMA=y
 # CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set
 CONFIG_CRYPTO_DEV_FSL_CAAM_JR=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
 CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
-# CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM is not set
+CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=y
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
@@ -454,6 +456,8 @@ CONFIG_FSL_LS2_CONSOLE=y
 CONFIG_FSL_MC_BUS=y
 CONFIG_FSL_MC_DPIO=y
 CONFIG_FSL_MC_RESTOOL=y
+CONFIG_FSL_PPFE=y
+CONFIG_FSL_PPFE_UTIL_DISABLED=y
 # CONFIG_FSL_QBMAN_DEBUG is not set
 # CONFIG_FSL_QDMA is not set
 CONFIG_FSL_QMAN_CI_SCHED_CFG_BMAN_W=2
@@ -696,7 +700,6 @@ CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
 # CONFIG_ISDN is not set
 CONFIG_JBD2=y
-# CONFIG_JFFS2_FS is not set
 CONFIG_JUMP_LABEL=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y