summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-11-19 18:45:29 -0500
committerTom Rini <trini@konsulko.com>2022-12-05 16:07:13 -0500
commit9200011e9563c2deb71eae3c6769a92ea4e6c733 (patch)
tree3f75621569386f408cb82c83f69387f5032045ef
parent6c03a652755ca415e3a1fa92525b5a8c230c9289 (diff)
downloadu-boot-9200011e9563c2deb71eae3c6769a92ea4e6c733.tar.gz
u-boot-9200011e9563c2deb71eae3c6769a92ea4e6c733.tar.bz2
u-boot-9200011e9563c2deb71eae3c6769a92ea4e6c733.zip
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>
-rw-r--r--arch/arm/mach-kirkwood/include/mach/config.h1
-rw-r--r--configs/kmcoge5ne_defconfig1
-rw-r--r--drivers/mtd/nand/raw/Kconfig13
-rw-r--r--include/configs/km/km-mpc83xx.h1
-rw-r--r--include/configs/kmcoge5ne.h2
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 a2781e25a2..a6de767629 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 71d196533f..c2a17c6212 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 eb37b62759..338a3562a4 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 e6a3613b7a..840a4d5401 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 2be996aaaf..c24d6ad8bc 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 */