| Message ID | 1420154295-16633-17-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 1 January 2015 at 16:18, Simon Glass <sjg@chromium.org> wrote: > For bare platforms we turn off ROM-caching before calling board_init_f_r() > It is then very slow to copy U-Boot from ROM to RAM. So adjust the order so > that the copying happens before we turn off ROM-caching. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v2: None > > common/board_f.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) Applied to u-boot-x86/next.
diff --git a/common/board_f.c b/common/board_f.c index cfd77f8..3a4b32c 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -985,6 +985,11 @@ static init_fnc_t init_sequence_f[] = { INIT_FUNC_WATCHDOG_RESET reloc_fdt, setup_reloc, +#ifdef CONFIG_X86 + copy_uboot_to_ram, + clear_bss, + do_elf_reloc_fixups, +#endif #if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) jump_to_copy, #endif @@ -1044,9 +1049,6 @@ void board_init_f(ulong boot_flags) */ static init_fnc_t init_sequence_f_r[] = { init_cache_f_r, - copy_uboot_to_ram, - clear_bss, - do_elf_reloc_fixups, NULL, };
For bare platforms we turn off ROM-caching before calling board_init_f_r() It is then very slow to copy U-Boot from ROM to RAM. So adjust the order so that the copying happens before we turn off ROM-caching. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v2: None common/board_f.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)