From 88718be3001055fa2801a44ab10570279b3f2cb7 Mon Sep 17 00:00:00 2001 From: Miquel Raynal Date: Thu, 3 Oct 2019 19:50:03 +0200 Subject: mtd: rename CONFIG_NAND -> CONFIG_MTD_RAW_NAND Add more clarity by changing the Kconfig entry name. Signed-off-by: Miquel Raynal [trini: Re-run migration, update a few more cases] Signed-off-by: Tom Rini Reviewed-by: Boris Brezillon --- arch/arm/mach-omap2/mem-common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arch/arm/mach-omap2/mem-common.c') diff --git a/arch/arm/mach-omap2/mem-common.c b/arch/arm/mach-omap2/mem-common.c index ff1e3125a0..50d5f3e9eb 100644 --- a/arch/arm/mach-omap2/mem-common.c +++ b/arch/arm/mach-omap2/mem-common.c @@ -25,7 +25,7 @@ const struct gpmc *gpmc_cfg = (struct gpmc *)GPMC_BASE; #if defined(CONFIG_NOR) char gpmc_cs0_flash = MTD_DEV_TYPE_NOR; -#elif defined(CONFIG_NAND) || defined(CONFIG_CMD_NAND) +#elif defined(CONFIG_MTD_RAW_NAND) || defined(CONFIG_CMD_NAND) char gpmc_cs0_flash = MTD_DEV_TYPE_NAND; #elif defined(CONFIG_CMD_ONENAND) char gpmc_cs0_flash = MTD_DEV_TYPE_ONENAND; @@ -93,7 +93,7 @@ void set_gpmc_cs0(int flash_type) STNOR_GPMC_CONFIG7 }; #endif -#if defined(CONFIG_NAND) || defined(CONFIG_CMD_NAND) +#if defined(CONFIG_MTD_RAW_NAND) || defined(CONFIG_CMD_NAND) const u32 gpmc_regs_nand[GPMC_MAX_REG] = { M_NAND_GPMC_CONFIG1, M_NAND_GPMC_CONFIG2, @@ -128,7 +128,7 @@ void set_gpmc_cs0(int flash_type) GPMC_SIZE_16M))); break; #endif -#if defined(CONFIG_NAND) || defined(CONFIG_CMD_NAND) +#if defined(CONFIG_MTD_RAW_NAND) || defined(CONFIG_CMD_NAND) case MTD_DEV_TYPE_NAND: gpmc_regs = gpmc_regs_nand; base = CONFIG_SYS_NAND_BASE; -- cgit