From e9295bc19e60bdfbffbf11d307f5587e8633d27d Mon Sep 17 00:00:00 2001
From: Dongjin Kim <tobetter@gmail.com>
Date: Mon, 3 Nov 2014 16:51:22 +0900
Subject: [PATCH] ODROIDC:mtd/nand: disable NAND features

Change-Id: I9c944a6bb4574e6b07f4d6007adaf997f1548f11
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
---
 arch/arm/configs/odroidc_defconfig | 27 +++++++++++++++++++++++++--
 drivers/amlogic/Kconfig            |  2 --
 drivers/amlogic/Makefile           |  6 ------
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/arch/arm/configs/odroidc_defconfig b/arch/arm/configs/odroidc_defconfig
index be726aa1c1cc..1f1d493b4998 100755
--- a/arch/arm/configs/odroidc_defconfig
+++ b/arch/arm/configs/odroidc_defconfig
@@ -1134,6 +1134,18 @@ CONFIG_MMC_AML=y
 #
 # CONFIG_AMLOGIC_SPI_NOR is not set
 
+#
+# Meson NAND Device Support(For NEXT GEN NAND DRIV)
+#
+# CONFIG_AML_NEXT_GEN_NAND is not set
+# CONFIG_AML_NFTL_NEW is not set
+
+#
+# Meson NAND Device Support
+#
+# CONFIG_AM_NAND is not set
+# CONFIG_AML_NEXT_NAND is not set
+
 #
 # Network devices
 #
@@ -1531,8 +1543,19 @@ CONFIG_MTD_CFI_I2=y
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
-# CONFIG_MTD_NAND_IDS is not set
-# CONFIG_MTD_NAND is not set
+CONFIG_MTD_NAND_IDS=y
+CONFIG_MTD_NAND_ECC=y
+# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_ECC_BCH is not set
+# CONFIG_MTD_SM_COMMON is not set
+# CONFIG_MTD_NAND_DENALI is not set
+# CONFIG_MTD_NAND_GPIO is not set
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_DOCG4 is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
 # CONFIG_MTD_ONENAND is not set
 
 #
diff --git a/drivers/amlogic/Kconfig b/drivers/amlogic/Kconfig
index aa1aa2e2c70c..6c6a5397084d 100755
--- a/drivers/amlogic/Kconfig
+++ b/drivers/amlogic/Kconfig
@@ -35,8 +35,6 @@ source "drivers/amlogic/usb/Kconfig"
 #source "drivers/amlogic/cardreader/Kconfig"
 source "drivers/amlogic/mmc/Kconfig"
 source "drivers/amlogic/spi_nor/Kconfig"
-isource "../hardware/amlogic/nand/amlnf/Kconfig"
-isource "../hardware/amlogic/nand/nand/Kconfig"
 
 #
 #	Network devices
diff --git a/drivers/amlogic/Makefile b/drivers/amlogic/Makefile
index 662fb4a34c04..9f6f9b4f40b7 100755
--- a/drivers/amlogic/Makefile
+++ b/drivers/amlogic/Makefile
@@ -33,12 +33,6 @@ obj-y += usb/
 obj-y += cpufreq/
 obj-$(CONFIG_GPIO_AMLOGIC) += gpio/
 obj-y += pinctrl/
-
-ifneq ($(wildcard $(srctree)/../hardware/amlogic/nand),)
-	obj-$(CONFIG_AML_NEXT_GEN_NAND) += ../../../hardware/amlogic/nand/amlnf/
-	obj-$(CONFIG_AM_NAND) += ../../../hardware/amlogic/nand/nand/
-endif
-
 obj-y += ethernet/
 
 obj-$(CONFIG_AM_CANVAS) += canvas/