leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etamin: Rework CONFIG_NAND_CS_INIT

Browse Source 
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>
This commit is contained in:
Tom Rini 2022-12-02 16:42:38 -05:00
parent 71894173bb
commit 3348c6b6a5
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/siemens/common/board.c
View File

@ -93,7 +93,7 @@ int board_init(void)
gpmc_init(); gpmc_init();
#ifdef CONFIG_NAND_CS_INIT #if CONFIG_IS_ENABLED(NAND_CS_INIT)
board_nand_cs_init(); board_nand_cs_init();
#endif #endif

2
board/siemens/draco/Kconfig
View File

@ -60,4 +60,6 @@ config SYS_SOC
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
default "etamin" default "etamin"
config NAND_CS_INIT
def_bool y
endif endif

9
board/siemens/draco/board.c
View File

@ -370,7 +370,14 @@ U_BOOT_CMD(
#endif /* #if defined(CONFIG_DRIVER_TI_CPSW) */ #endif /* #if defined(CONFIG_DRIVER_TI_CPSW) */
#endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */ #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 */ /* GPMC definitions for second nand cs1 */
static const u32 gpmc_nand_config[] = { static const u32 gpmc_nand_config[] = {
ETAMIN_NAND_GPMC_CONFIG1, ETAMIN_NAND_GPMC_CONFIG1,

12
include/configs/etamin.h
View File

@ -127,16 +127,6 @@
"bootm ${kloadaddr} - ${loadaddr}\0" \ "bootm ${kloadaddr} - ${loadaddr}\0" \
COMMON_ENV_NAND_CMDS 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 */ /* Default env settings */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"hostname=etamin\0" \ "hostname=etamin\0" \
@ -147,5 +137,5 @@
CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \ CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
CONFIG_ENV_SETTINGS_V2 \ CONFIG_ENV_SETTINGS_V2 \
CONFIG_ENV_SETTINGS_NAND_V2 CONFIG_ENV_SETTINGS_NAND_V2
#endif /* CONFIG_SPL_BUILD */
#endif /* ! __CONFIG_ETAMIN_H */ #endif /* ! __CONFIG_ETAMIN_H */