diff options
author | Tom Rini <trini@ti.com> | 2013-05-13 18:17:39 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-05-13 18:17:39 -0400 |
commit | a661b99dbc35e725f229a7b8e189ca21304ba026 (patch) | |
tree | b3f329efb8cda7a47db2b0e7bbbf6454a3e76db8 /arch/x86/lib/zimage.c | |
parent | a7e62be09189dae3a16882e53f15c38754f9db91 (diff) | |
parent | 8f0278eab4410de57ea6a32a8e5a50614a28084f (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/lib/zimage.c')
-rw-r--r-- | arch/x86/lib/zimage.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 4e9e1f77e5..b54cf1261f 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -283,6 +283,13 @@ __weak void board_final_cleanup(void) void boot_zimage(void *setup_base, void *load_address) { + debug("## Transferring control to Linux (at address %08x) ...\n", + (u32)setup_base); + + bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel"); +#ifdef CONFIG_BOOTSTAGE_REPORT + bootstage_report(); +#endif board_final_cleanup(); printf("\nStarting kernel ...\n\n"); @@ -363,10 +370,6 @@ int do_zboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) return -1; } - printf("## Transferring control to Linux " - "(at address %08x) ...\n", - (u32)base_ptr); - /* we assume that the kernel is in place */ boot_zimage(base_ptr, load_address); /* does not return */ |