[PoC 133/241] global: Migrate CONFIG_NAND_CS_INIT to CFG

Tom Rini
2022-11-20T14:11:59Z

board/siemens/common/board.c | 2 +-
board/siemens/draco/board.c | 2 +-
include/configs/etamin.h | 2 +-
scripts/config_whitelist.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index 2efede62aa5d..1b3c06d13e55 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -93,7 +93,7 @@ int board_init(void)

gpmc_init();

-#ifdef CONFIG_NAND_CS_INIT
+#ifdef CFG_NAND_CS_INIT
board_nand_cs_init();
#endif

diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
index f898bba4b0ee..fb81f40abceb 100644
--- a/board/siemens/draco/board.c
+++ b/board/siemens/draco/board.c
@@ -370,7 +370,7 @@ U_BOOT_CMD(
#endif /* #if defined(CONFIG_DRIVER_TI_CPSW) */
#endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */

-#ifdef CONFIG_NAND_CS_INIT
+#ifdef CFG_NAND_CS_INIT
/* GPMC definitions for second nand cs1 */
static const u32 gpmc_nand_config[] = {
ETAMIN_NAND_GPMC_CONFIG1,
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 8b2745ea96e4..861070866923 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -129,7 +129,7 @@

#ifndef CONFIG_SPL_BUILD

-#define CONFIG_NAND_CS_INIT
+#define CFG_NAND_CS_INIT
#define ETAMIN_NAND_GPMC_CONFIG1 0x00000800
#define ETAMIN_NAND_GPMC_CONFIG2 0x001e1e00
#define ETAMIN_NAND_GPMC_CONFIG3 0x001e1e00
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a7409a7f4978..e7d5f9ba57ca 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -142,7 +142,7 @@ CFG_MXC_USB_FLAGS
CFG_MXC_USB_PORT
CFG_MXC_USB_PORTSC
CFG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
-CONFIG_NAND_CS_INIT
+CFG_NAND_CS_INIT
CONFIG_NETDEV
CONFIG_NETMASK
CONFIG_NORBOOT
--
2.25.1