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

arm, davinci: perform check for initializing global data and serial init

Browse Source 
initialize baudrate, flags, data and serial initialization,
only when CONFIG_SPL_LIBCOMMON_SUPPORT is defined.

Tested-by: Christian Riesch <christian.riesch@omicron.at>
Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Rajashekhara, Sudhakar <sudhakar.raj@ti.com>
Signed-off-by: Hadli, Manjunath <manjunath.hadli@ti.com>
Acked-by: Christian Riesch <christian.riesch@omicron.at>
This commit is contained in:
Lad, Prabhakar 2012-06-24 21:35:18 +00:00 committed by Albert ARIBAUD
parent 4a5edda2ed
commit 560e69bf6a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/cpu/arm926ejs/davinci/spl.c
View File

@ -74,12 +74,7 @@ void board_init_f(ulong dummy)
void board_init_r(gd_t *id, ulong dummy) void board_init_r(gd_t *id, ulong dummy)
{ {
#ifdef CONFIG_SPL_NAND_LOAD #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
nand_init();
puts("Nand boot...\n");
nand_boot();
#endif
#ifdef CONFIG_SPL_SPI_LOAD
mem_malloc_init(CONFIG_SYS_TEXT_BASE - CONFIG_SYS_MALLOC_LEN, mem_malloc_init(CONFIG_SYS_TEXT_BASE - CONFIG_SYS_MALLOC_LEN,
CONFIG_SYS_MALLOC_LEN); CONFIG_SYS_MALLOC_LEN);
@ -90,6 +85,14 @@ void board_init_r(gd_t *id, ulong dummy)
serial_init(); /* serial communications setup */ serial_init(); /* serial communications setup */
gd->have_console = 1; gd->have_console = 1;
#endif
#ifdef CONFIG_SPL_NAND_LOAD
nand_init();
puts("Nand boot...\n");
nand_boot();
#endif
#ifdef CONFIG_SPL_SPI_LOAD
puts("SPI boot...\n"); puts("SPI boot...\n");
spi_boot(); spi_boot();
#endif #endif