minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 03:58:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

ARM: SPL: Move gpmc_init() to spl_board_init()

Browse Source 
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:
Tom Rini 2012-08-14 12:26:08 -07:00
parent d4c4e0e117
commit d7cb93b28a
7 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/cpu/armv7/omap-common/boot-common.c
View File

@ -49,6 +49,13 @@ u32 spl_boot_mode(void)
return omap_bootmode; return omap_bootmode;
} }
void spl_board_init(void)
{
#ifdef CONFIG_SPL_NAND_SUPPORT
gpmc_init();
#endif
}
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
switch (spl_boot_device()) { switch (spl_boot_device()) {

1
arch/arm/cpu/armv7/omap-common/spl_nand.c
View File

@ -35,7 +35,6 @@ void spl_nand_load_image(void)
int *dst __attribute__((unused)); int *dst __attribute__((unused));
debug("spl: nand - using hw ecc\n"); debug("spl: nand - using hw ecc\n");
gpmc_init();
nand_init(); nand_init();
/*use CONFIG_SYS_TEXT_BASE as temporary storage area */ /*use CONFIG_SYS_TEXT_BASE as temporary storage area */

3
arch/arm/cpu/armv7/omap3/board.c
View File

@ -106,6 +106,9 @@ int board_mmc_init(bd_t *bis)
void spl_board_init(void) void spl_board_init(void)
{ {
#ifdef CONFIG_SPL_NAND_SUPPORT
gpmc_init();
#endif
#ifdef CONFIG_SPL_I2C_SUPPORT #ifdef CONFIG_SPL_I2C_SUPPORT
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
#endif #endif

1
include/configs/am3517_crane.h
View File

@ -314,6 +314,7 @@
/* Defines for SPL */ /* Defines for SPL */
#define CONFIG_SPL #define CONFIG_SPL
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_TEXT_BASE 0x40200800 #define CONFIG_SPL_TEXT_BASE 0x40200800
#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */ #define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */

1
include/configs/am3517_evm.h
View File

@ -313,6 +313,7 @@
/* Defines for SPL */ /* Defines for SPL */
#define CONFIG_SPL #define CONFIG_SPL
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_TEXT_BASE 0x40200800 #define CONFIG_SPL_TEXT_BASE 0x40200800
#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */ #define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */

1
include/configs/mcx.h
View File

@ -359,6 +359,7 @@
/* Defines for SPL */ /* Defines for SPL */
#define CONFIG_SPL #define CONFIG_SPL
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SPL_NAND_SOFTECC

1
include/configs/tam3517-common.h
View File

@ -239,6 +239,7 @@
/* Defines for SPL */ /* Defines for SPL */
#define CONFIG_SPL #define CONFIG_SPL
#define CONFIG_SPL_BOARD_INIT
#define CONFIG_SPL_CONSOLE #define CONFIG_SPL_CONSOLE
#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SIMPLE
#define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SPL_NAND_SOFTECC