summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2011-10-05 13:13:06 -0700
committerStefan Reinauer <reinauer@chromium.org>2011-10-06 17:23:20 -0700
commit89e45994596ebb2f305847ccdcfc937d6df30922 (patch)
tree4044ec3e22a3a276e0b5382320820d533192f027 /arch
parent12275b8f02a482d0bc8477a0f53363204e6c4afd (diff)
Move Starting kernel... message to the function that starts the kernel
Because with vboot the message would not be printed otherwise. BUG=none TEST=vboot on a Stumpy, see message about starting the kernel appear. Signed-off-by: Stefan Reinauer <reinauer@google.com> Change-Id: I73a5230edcc56b1f80acba1b99691cde7fdc33c6 Reviewed-on: http://gerrit.chromium.org/gerrit/8921 Tested-by: Stefan Reinauer <reinauer@chromium.org> Reviewed-by: Gabe Black (Do Not Use) <gabeblack@google.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/lib/zimage.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 94b6e31203..20abc98417 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -286,6 +286,8 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
void boot_zimage(void *setup_base, void *load_address)
{
+ printf("\nStarting kernel ...\n\n");
+
#if defined CONFIG_NO_REALMODE_CODE || defined CONFIG_ZBOOT_32
/*
* Set %ebx, %ebp, and %edi to 0, %esi to point to the boot_params
@@ -361,8 +363,6 @@ int do_zboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
(u32)base_ptr);
/* we assume that the kernel is in place */
- printf("\nStarting kernel ...\n\n");
-
boot_zimage(base_ptr, load_address);
/* does not return */