ARM: SPL: Move gpmc_init() to spl_board_init()
This is an OMAP/related-specific function, move calling it to spl_board_init() and turn on CONFIG_SPL_BOARD_INIT on the boards that enabled NAND and didn't enable this already. Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
parent
d4c4e0e117
commit
d7cb93b28a
|
@ -49,6 +49,13 @@ u32 spl_boot_mode(void)
|
|||
return omap_bootmode;
|
||||
}
|
||||
|
||||
void spl_board_init(void)
|
||||
{
|
||||
#ifdef CONFIG_SPL_NAND_SUPPORT
|
||||
gpmc_init();
|
||||
#endif
|
||||
}
|
||||
|
||||
int board_mmc_init(bd_t *bis)
|
||||
{
|
||||
switch (spl_boot_device()) {
|
||||
|
|
|
@ -35,7 +35,6 @@ void spl_nand_load_image(void)
|
|||
int *dst __attribute__((unused));
|
||||
|
||||
debug("spl: nand - using hw ecc\n");
|
||||
gpmc_init();
|
||||
nand_init();
|
||||
|
||||
/*use CONFIG_SYS_TEXT_BASE as temporary storage area */
|
||||
|
|
|
@ -106,6 +106,9 @@ int board_mmc_init(bd_t *bis)
|
|||
|
||||
void spl_board_init(void)
|
||||
{
|
||||
#ifdef CONFIG_SPL_NAND_SUPPORT
|
||||
gpmc_init();
|
||||
#endif
|
||||
#ifdef CONFIG_SPL_I2C_SUPPORT
|
||||
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
|
||||
#endif
|
||||
|
|
|
@ -314,6 +314,7 @@
|
|||
|
||||
/* Defines for SPL */
|
||||
#define CONFIG_SPL
|
||||
#define CONFIG_SPL_BOARD_INIT
|
||||
#define CONFIG_SPL_NAND_SIMPLE
|
||||
#define CONFIG_SPL_TEXT_BASE 0x40200800
|
||||
#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
|
||||
|
|
|
@ -313,6 +313,7 @@
|
|||
|
||||
/* Defines for SPL */
|
||||
#define CONFIG_SPL
|
||||
#define CONFIG_SPL_BOARD_INIT
|
||||
#define CONFIG_SPL_NAND_SIMPLE
|
||||
#define CONFIG_SPL_TEXT_BASE 0x40200800
|
||||
#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
|
||||
|
|
|
@ -359,6 +359,7 @@
|
|||
|
||||
/* Defines for SPL */
|
||||
#define CONFIG_SPL
|
||||
#define CONFIG_SPL_BOARD_INIT
|
||||
#define CONFIG_SPL_NAND_SIMPLE
|
||||
#define CONFIG_SPL_NAND_SOFTECC
|
||||
|
||||
|
|
|
@ -239,6 +239,7 @@
|
|||
|
||||
/* Defines for SPL */
|
||||
#define CONFIG_SPL
|
||||
#define CONFIG_SPL_BOARD_INIT
|
||||
#define CONFIG_SPL_CONSOLE
|
||||
#define CONFIG_SPL_NAND_SIMPLE
|
||||
#define CONFIG_SPL_NAND_SOFTECC
|
||||
|
|
Loading…
Reference in New Issue