[PATCH 22/38] Convert CONFIG_NAND_KMETER1 et al to Kconfig

Tom Rini
2022-11-19T23:51:15Z

This converts the following to Kconfig:
CONFIG_NAND_ECC_BCH
CONFIG_NAND_KIRKWOOD
CONFIG_NAND_KMETER1

Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-kirkwood/include/mach/config.h | 1 -
configs/kmcoge5ne_defconfig | 1 +
drivers/mtd/nand/raw/Kconfig | 13 +++++++++++++
include/configs/km/km-mpc83xx.h | 1 -
include/configs/kmcoge5ne.h | 2 --
5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
index a2781e25a23b..a6de7676294b 100644
--- 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 71d196533f7e..c2a17c6212f1 100644
--- 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 eb37b6275998..338a3562a4ac 100644
--- 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 e6a3613b7a24..840a4d5401f5 100644
--- 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 2be996aaaf08..c24d6ad8bc2d 100644
--- 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 */

--
2.25.1