projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetic: Whitespace fix
[oweals/u-boot.git]
/
arch
/
arm
/
lib
/
board.c
diff --git
a/arch/arm/lib/board.c
b/arch/arm/lib/board.c
index 1de58122e4063300dccb3d0f0d16dd065a80400f..76adaf3aa4abf69916155cadd9f1e9e1a5effdb7 100644
(file)
--- a/
arch/arm/lib/board.c
+++ b/
arch/arm/lib/board.c
@@
-33,6
+33,7
@@
#include <nand.h>
#include <onenand_uboot.h>
#include <mmc.h>
#include <nand.h>
#include <onenand_uboot.h>
#include <mmc.h>
+#include <scsi.h>
#include <libfdt.h>
#include <fdtdec.h>
#include <post.h>
#include <libfdt.h>
#include <fdtdec.h>
#include <post.h>
@@
-276,7
+277,7
@@
void board_init_f(ulong bootflag)
gd->mon_len = (ulong)&__bss_end - (ulong)_start;
#ifdef CONFIG_OF_EMBED
/* Get a pointer to the FDT */
gd->mon_len = (ulong)&__bss_end - (ulong)_start;
#ifdef CONFIG_OF_EMBED
/* Get a pointer to the FDT */
- gd->fdt_blob = __dtb_d
b
_begin;
+ gd->fdt_blob = __dtb_d
t
_begin;
#elif defined CONFIG_OF_SEPARATE
/* FDT is at end of image */
gd->fdt_blob = &_end;
#elif defined CONFIG_OF_SEPARATE
/* FDT is at end of image */
gd->fdt_blob = &_end;
@@
-318,7
+319,7
@@
void board_init_f(ulong bootflag)
gd->ram_size -= CONFIG_SYS_MEM_TOP_HIDE;
#endif
gd->ram_size -= CONFIG_SYS_MEM_TOP_HIDE;
#endif
- addr = CONFIG_SYS_SDRAM_BASE + g
d->ram_size
;
+ addr = CONFIG_SYS_SDRAM_BASE + g
et_effective_memsize()
;
#ifdef CONFIG_LOGBUFFER
#ifndef CONFIG_ALT_LB_ADDR
#ifdef CONFIG_LOGBUFFER
#ifndef CONFIG_ALT_LB_ADDR
@@
-444,7
+445,6
@@
void board_init_f(ulong bootflag)
post_run(NULL, POST_ROM | post_bootmode_get(0));
#endif
post_run(NULL, POST_ROM | post_bootmode_get(0));
#endif
- gd->bd->bi_baudrate = gd->baudrate;
/* Ram ist board specific, so move it to board code ... */
dram_init_banksize();
display_dram_config(); /* and display it */
/* Ram ist board specific, so move it to board code ... */
dram_init_banksize();
display_dram_config(); /* and display it */
@@
-593,6
+593,11
@@
void board_init_r(gd_t *id, ulong dest_addr)
mmc_initialize(gd->bd);
#endif
mmc_initialize(gd->bd);
#endif
+#ifdef CONFIG_CMD_SCSI
+ puts("SCSI: ");
+ scsi_init();
+#endif
+
#ifdef CONFIG_HAS_DATAFLASH
AT91F_DataflashInit();
dataflash_print_info();
#ifdef CONFIG_HAS_DATAFLASH
AT91F_DataflashInit();
dataflash_print_info();