X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Farm%2Flib%2Fboard.c;h=92e85c4db5152cf1f4d68671b1e76d68dcba1bcd;hb=1cad23c5f471d695bed1e3907e30caee3c2a3056;hp=1de58122e4063300dccb3d0f0d16dd065a80400f;hpb=b60eff31f3bd71a6f14b6c6efc8ad5fb3705de6d;p=u-boot diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 1de58122e4..92e85c4db5 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -318,7 +319,7 @@ void board_init_f(ulong bootflag) gd->ram_size -= CONFIG_SYS_MEM_TOP_HIDE; #endif - addr = CONFIG_SYS_SDRAM_BASE + gd->ram_size; + addr = CONFIG_SYS_SDRAM_BASE + get_effective_memsize(); #ifdef CONFIG_LOGBUFFER #ifndef CONFIG_ALT_LB_ADDR @@ -593,6 +594,11 @@ void board_init_r(gd_t *id, ulong dest_addr) mmc_initialize(gd->bd); #endif +#ifdef CONFIG_CMD_SCSI + puts("SCSI: "); + scsi_init(); +#endif + #ifdef CONFIG_HAS_DATAFLASH AT91F_DataflashInit(); dataflash_print_info();