Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: Move test for cold boot into init functions

Browse source
This commit is contained in:
Graeme Russ 2011-02-12 15:12:01 +11:00
parent c869e2ac46
commit bf6af154a4
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/i386/cpu/sc520/sc520.c
View file

@ -45,15 +45,16 @@ int cpu_init_f(void)
gd->cpu_clk = 100000000;
}
/* wait at least one millisecond */
asm("movl $0x2000, %%ecx\n"
"0: pushl %%ecx\n"
"popl %%ecx\n"
"loop 0b\n": : : "ecx");
/* turn on the SDRAM write buffer */
writeb(0x11, &sc520_mmcr->dbctl);
if (gd->flags & GD_FLG_COLD_BOOT) {
/* turn on the SDRAM write buffer */
writeb(0x11, &sc520_mmcr->dbctl);
}
return x86_cpu_init_f();
}

15
arch/i386/lib/board.c
View file

@ -207,16 +207,13 @@ void board_init_f(ulong boot_flags)
dest_addr -= (bss_end - text_start);
rel_offset = text_start - dest_addr;
/* Perform low-level initialization only when cold booted */
if (gd->flags & GD_FLG_COLD_BOOT) {
/* First stage CPU initialization */
if (cpu_init_f() != 0)
hang();
/* First stage CPU initialization */
if (cpu_init_f() != 0)
hang();
/* First stage Board initialization */
if (board_early_init_f() != 0)
hang();
}
/* First stage Board initialization */
if (board_early_init_f() != 0)
hang();
/* Copy U-Boot into RAM */
dst_addr = (ulong *)dest_addr;