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 --- include/configs/p1_p2_rdb_pc.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/configs/p1_p2_rdb_pc.h') diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 39cec354d8..c42f1a9fce 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -163,7 +163,7 @@ #endif #endif -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND #ifdef CONFIG_TPL_BUILD #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_NAND_INIT @@ -442,7 +442,7 @@ OR_GPCM_SCY | OR_GPCM_TRLX | OR_GPCM_EHTR | \ OR_GPCM_EAD) -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND #define CONFIG_SYS_BR0_PRELIM CONFIG_SYS_NAND_BR_PRELIM /* NAND Base Addr */ #define CONFIG_SYS_OR0_PRELIM CONFIG_SYS_NAND_OR_PRELIM /* NAND Options */ #define CONFIG_SYS_BR1_PRELIM CONFIG_FLASH_BR_PRELIM /* NOR Base Address */ @@ -498,7 +498,7 @@ #else #define CONFIG_SPL_RELOC_MALLOC_SIZE (108 << 10) #endif -#elif defined(CONFIG_NAND) +#elif defined(CONFIG_MTD_RAW_NAND) #ifdef CONFIG_TPL_BUILD #define CONFIG_SYS_INIT_L2_ADDR 0xf8f80000 #define CONFIG_SYS_INIT_L2_ADDR_PHYS CONFIG_SYS_INIT_L2_ADDR @@ -699,7 +699,7 @@ #if defined(CONFIG_SDCARD) #define CONFIG_FSL_FIXED_MMC_LOCATION #define CONFIG_SYS_MMC_ENV_DEV 0 -#elif defined(CONFIG_NAND) +#elif defined(CONFIG_MTD_RAW_NAND) #define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE) #ifdef CONFIG_TPL_BUILD #define SPL_ENV_ADDR (CONFIG_SYS_INIT_L2_ADDR + (160 << 10)) -- cgit v1.2.3