summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-10-10 08:21:59 -0600
committerSimon Glass <sjg@chromium.org>2014-10-28 20:44:27 -0600
commit2c363cb0034284f26d6ae550b313fc2e62a41360 (patch)
tree9a16fa52cf92238051e3f39c20ed3edb8da365f5 /arch
parent61643ae61a8da145445778660042409903018506 (diff)
downloadblackbird-obmc-uboot-2c363cb0034284f26d6ae550b313fc2e62a41360.tar.gz
blackbird-obmc-uboot-2c363cb0034284f26d6ae550b313fc2e62a41360.zip
x86: Correct a few progress message nits
We should use puts() instead of printf() where possible. Also clarify the setup.bin message. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/lib/bootm.c2
-rw-r--r--arch/x86/lib/zimage.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 46a1d967e4..86030cf52a 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -121,7 +121,7 @@ static int boot_prep_linux(bootm_headers_t *images)
} else if (images->ep) {
cmd_line_dest = (void *)images->ep + COMMAND_LINE_OFFSET;
} else {
- printf("## Kernel loading failed (no setup) ...\n");
+ printf("## Kernel loading failed (missing x86 kernel setup) ...\n");
goto error;
}
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index aa5597c94d..566b048c88 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -307,12 +307,12 @@ int do_zboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
base_ptr = load_zimage(bzImage_addr, bzImage_size, &load_address);
if (!base_ptr) {
- printf("## Kernel loading failed ...\n");
+ puts("## Kernel loading failed ...\n");
return -1;
}
if (setup_zimage(base_ptr, (char *)base_ptr + COMMAND_LINE_OFFSET,
0, initrd_addr, initrd_size)) {
- printf("Setting up boot parameters failed ...\n");
+ puts("Setting up boot parameters failed ...\n");
return -1;
}
OpenPOWER on IntegriCloud