Convert CONFIG_NAND_KMETER1 et al to Kconfig

This converts the following to Kconfig:
   CONFIG_NAND_ECC_BCH
   CONFIG_NAND_KIRKWOOD
   CONFIG_NAND_KMETER1

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
index a2781e25a23bf8eedeb7ab9149f16287b74f35fe..a6de7676294ba7a20a7d59f8640a135887aa88b0 100644 (file)
--- a/arch/arm/mach-kirkwood/include/mach/config.h
+++ b/arch/arm/mach-kirkwood/include/mach/config.h
@@ -34,7 +34,6 @@
  * NAND configuration
  */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_NAND_KIRKWOOD
 #define CFG_SYS_NAND_BASE              0xD8000000      /* MV_DEFADR_NANDF */
 #define NAND_ALLOW_ERASE_ALL           1
 #endif

diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index 71d196533f7e789b52e5f6ec14618444057201ec..c2a17c6212f1cfe97f43abb48a0b03d152617513 100644 (file)
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -235,6 +235,7 @@ CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_MTD_RAW_NAND=y
+CONFIG_NAND_KMETER1=y
 CONFIG_DM_ETH_PHY=y
 CONFIG_QE_UEC=y
 # CONFIG_PCI is not set

diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
index eb37b627599803f4ee708a2e970c378f6c900f98..338a3562a4ac9deb4e0c02a39486059fad4aca02 100644 (file)
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -225,6 +225,19 @@ config NAND_FSL_IFC
        help
          Enable the Freescale Integrated Flash Controller NAND driver.
 
+config NAND_KIRKWOOD
+       bool "Support for Kirkwood NAND controller"
+       depends on ARCH_KIRKWOOD
+       default y
+
+config NAND_ECC_BCH
+       bool
+
+config NAND_KMETER1
+       bool "Support KMETER1 NAND controller"
+       depends on VENDOR_KM
+       select NAND_ECC_BCH
+
 config NAND_LPC32XX_MLC
        bool "Support LPC32XX_MLC controller"
        select SYS_NAND_SELF_INIT

diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index e6a3613b7a24ece1c520ffacc6bac7549c2e90e3..840a4d5401f55d6e5204cc5c402ffabb37337aed 100644 (file)
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -57,7 +57,6 @@
                {1, {I2C_NULL_HOP} } }
 
 #if defined(CONFIG_CMD_NAND)
-#define CONFIG_NAND_KMETER1
 #define CFG_SYS_NAND_BASE              CFG_SYS_KMBEC_FPGA_BASE
 #endif
 

diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h
index 2be996aaaf083f2023cd43ae1993d9ebb566a429..c24d6ad8bc2d3ebdfcfc4656bec90d4d96c37460 100644 (file)
--- a/include/configs/kmcoge5ne.h
+++ b/include/configs/kmcoge5ne.h
@@ -9,8 +9,6 @@
 #define __CONFIG_H
 
 #define CONFIG_HOSTNAME                "kmcoge5ne"
-#define CONFIG_NAND_ECC_BCH
-#define CONFIG_NAND_KMETER1
 #define NAND_MAX_CHIPS                         1
 #define CFG_SYS_NAND_BASE CFG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */