[PATCH 28/41] etamin: Rework CONFIG_NAND_CS_INIT

Tom Rini
2022-12-02T21:48:46Z

Enable this in the board Kconfig file, but then check for it via
CONFIG_IS_ENABLED so that it will only be true in the non-SPL case, as
is done today. As part of this we move some defines local to where
they are used as it's board specific.

Cc: Samuel Egli <samuel.egli@siemens.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
board/siemens/common/board.c | 2 +-
board/siemens/draco/Kconfig | 2 ++
board/siemens/draco/board.c | 9 ++++++++-
include/configs/etamin.h | 12 +-----------
4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index 2efede62aa5d..8fa9197a6dfb 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
+#if CONFIG_IS_ENABLED(NAND_CS_INIT)
board_nand_cs_init();
#endif

diff --git a/board/siemens/draco/Kconfig b/board/siemens/draco/Kconfig
index a699c7d46f79..1eb8a4886f4c 100644
--- a/board/siemens/draco/Kconfig
+++ b/board/siemens/draco/Kconfig
@@ -60,4 +60,6 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "etamin"

+config NAND_CS_INIT
+ def_bool y
endif
diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
index f898bba4b0ee..8874659013fc 100644
--- a/board/siemens/draco/board.c
+++ b/board/siemens/draco/board.c
@@ -370,7 +370,14 @@ 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
+#if CONFIG_IS_ENABLED(NAND_CS_INIT)
+#define ETAMIN_NAND_GPMC_CONFIG1 0x00000800
+#define ETAMIN_NAND_GPMC_CONFIG2 0x001e1e00
+#define ETAMIN_NAND_GPMC_CONFIG3 0x001e1e00
+#define ETAMIN_NAND_GPMC_CONFIG4 0x16051807
+#define ETAMIN_NAND_GPMC_CONFIG5 0x00151e1e
+#define ETAMIN_NAND_GPMC_CONFIG6 0x16000f80
+
/* 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 6647148c96f4..811c7cb96188 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -127,16 +127,6 @@
"bootm ${kloadaddr} - ${loadaddr}\0" \
COMMON_ENV_NAND_CMDS

-#ifndef CONFIG_SPL_BUILD
-
-#define CONFIG_NAND_CS_INIT
-#define ETAMIN_NAND_GPMC_CONFIG1 0x00000800
-#define ETAMIN_NAND_GPMC_CONFIG2 0x001e1e00
-#define ETAMIN_NAND_GPMC_CONFIG3 0x001e1e00
-#define ETAMIN_NAND_GPMC_CONFIG4 0x16051807
-#define ETAMIN_NAND_GPMC_CONFIG5 0x00151e1e
-#define ETAMIN_NAND_GPMC_CONFIG6 0x16000f80
-
/* Default env settings */
#define CONFIG_EXTRA_ENV_SETTINGS \
"hostname=etamin\0" \
@@ -147,5 +137,5 @@
CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
CONFIG_ENV_SETTINGS_V2 \
CONFIG_ENV_SETTINGS_NAND_V2
-#endif /* CONFIG_SPL_BUILD */
+
#endif /* ! __CONFIG_ETAMIN_H */
--
2.25.1