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/C29XPCIE.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/configs/C29XPCIE.h') diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index dea196dd17..d21537c773 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -15,7 +15,7 @@ #define CONFIG_RESET_VECTOR_ADDRESS 0x110bfffc #endif -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND #ifdef CONFIG_TPL_BUILD #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_NAND_INIT @@ -215,7 +215,7 @@ #define CONFIG_SYS_NAND_DDR_LAW 11 /* Set up IFC registers for boot location NOR/NAND */ -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND #define CONFIG_SYS_CSPR0 CONFIG_SYS_NAND_CSPR #define CONFIG_SYS_AMASK0 CONFIG_SYS_NAND_AMASK #define CONFIG_SYS_CSOR0 CONFIG_SYS_NAND_CSOR @@ -300,7 +300,7 @@ #define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 160 * 1024) #define CONFIG_SPL_RELOC_MALLOC_SIZE (96 << 10) #define CONFIG_SPL_GD_ADDR (CONFIG_SYS_INIT_L2_ADDR + 112 * 1024) -#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 @@ -375,7 +375,7 @@ * Environment */ #if defined(CONFIG_SYS_RAMBOOT) -#elif defined(CONFIG_NAND) +#elif defined(CONFIG_MTD_RAW_NAND) #ifdef CONFIG_TPL_BUILD #define SPL_ENV_ADDR (CONFIG_SYS_INIT_L2_ADDR + (160 << 10)) #else -- cgit