summaryrefslogtreecommitdiffstats
path: root/arch/x86/lib/bootm.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-05-13 18:17:39 -0400
committerTom Rini <trini@ti.com>2013-05-13 18:17:39 -0400
commita661b99dbc35e725f229a7b8e189ca21304ba026 (patch)
treeb3f329efb8cda7a47db2b0e7bbbf6454a3e76db8 /arch/x86/lib/bootm.c
parenta7e62be09189dae3a16882e53f15c38754f9db91 (diff)
parent8f0278eab4410de57ea6a32a8e5a50614a28084f (diff)
downloadtalos-obmc-uboot-a661b99dbc35e725f229a7b8e189ca21304ba026.tar.gz
talos-obmc-uboot-a661b99dbc35e725f229a7b8e189ca21304ba026.zip
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/lib/bootm.c')
-rw-r--r--arch/x86/lib/bootm.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 83caf6bdbd..2520228b4c 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -93,14 +93,6 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
goto error;
}
-#ifdef DEBUG
- printf("## Transferring control to Linux (at address %08x) ...\n",
- (u32)base_ptr);
-#endif
-
- /* we assume that the kernel is in place */
- printf("\nStarting kernel ...\n\n");
-
boot_zimage(base_ptr, load_address);
/* does not return */
OpenPOWER on IntegriCloud