Xilinx: ARM: Adding NAND driver to kernel default configs

The driver has been manually tested and is added to automated tests.

diff --git a/arch/arm/configs/xilinx_defconfig b/arch/arm/configs/xilinx_defconfig
index 8bd5e7f5381218fb76114f935e037413a4fff2d7..04d295a023df303982c7dd178a2a23ceae97d0aa 100644 (file)
--- a/arch/arm/configs/xilinx_defconfig
+++ b/arch/arm/configs/xilinx_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34
-# Wed Aug 25 13:31:04 2010
+# Fri Aug 27 15:33:51 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -551,7 +551,16 @@ CONFIG_MTD_PHYSMAP=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-# CONFIG_MTD_NAND is not set
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_GPIO is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+CONFIG_MTD_NAND_XILINX_PSS=y
 # CONFIG_MTD_ONENAND is not set
 
 #

diff --git a/arch/arm/configs/xilinx_smp_defconfig b/arch/arm/configs/xilinx_smp_defconfig
index 04b4460661f897a7980d7887b3e7c8867b84cbc3..325aa1e4eec06c4e9a24327a93a2a91b08c671ab 100644 (file)
--- a/arch/arm/configs/xilinx_smp_defconfig
+++ b/arch/arm/configs/xilinx_smp_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34
-# Wed Aug 25 13:33:07 2010
+# Fri Aug 27 15:34:42 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -556,7 +556,16 @@ CONFIG_MTD_PHYSMAP=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-# CONFIG_MTD_NAND is not set
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_GPIO is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+CONFIG_MTD_NAND_XILINX_PSS=y
 # CONFIG_MTD_ONENAND is not set
 
 #