NAND was used in the early development phase of etamin. The board runs now on MMC. This setting is no more used -> remove to simplify the board file.
Further clean-up of etamin should remove all NAND settings. Complete clean- up of etamin board will take place in a separate patch serie.
Signed-off-by: Enrico Leto enrico.leto@siemens.com --- board/siemens/common/board.c | 4 ---- board/siemens/draco/Kconfig | 2 -- board/siemens/draco/board.c | 26 -------------------------- 3 files changed, 32 deletions(-)
diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c index e412858c4a9..e5a42d734bb 100644 --- a/board/siemens/common/board.c +++ b/board/siemens/common/board.c @@ -93,10 +93,6 @@ int board_init(void)
gpmc_init();
-#if CONFIG_IS_ENABLED(NAND_CS_INIT) - board_nand_cs_init(); -#endif - return 0; } #endif /* #ifndef CONFIG_SPL_BUILD */ diff --git a/board/siemens/draco/Kconfig b/board/siemens/draco/Kconfig index 0cdf5bc9812..9d45c4239be 100644 --- a/board/siemens/draco/Kconfig +++ b/board/siemens/draco/Kconfig @@ -44,6 +44,4 @@ config SYS_SOC config SYS_CONFIG_NAME default "draco-etamin"
-config NAND_CS_INIT - def_bool y endif diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c index 30ad9d7ab3a..d108d3e49db 100644 --- a/board/siemens/draco/board.c +++ b/board/siemens/draco/board.c @@ -358,30 +358,4 @@ U_BOOT_CMD( #endif /* #if defined(CONFIG_DRIVER_TI_CPSW) */ #endif /* #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) */
-#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, - ETAMIN_NAND_GPMC_CONFIG2, - ETAMIN_NAND_GPMC_CONFIG3, - ETAMIN_NAND_GPMC_CONFIG4, - ETAMIN_NAND_GPMC_CONFIG5, - ETAMIN_NAND_GPMC_CONFIG6, - /*CONFIG7- computed as params */ -}; - -static void board_nand_cs_init(void) -{ - enable_gpmc_cs_config(gpmc_nand_config, &gpmc_cfg->cs[1], - 0x18000000, GPMC_SIZE_16M); -} -#endif - #include "../common/board.c"