summaryrefslogtreecommitdiff
path: root/arch/microblaze
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2019-10-17 13:16:56 +0200
committerMichal Simek <michal.simek@xilinx.com>2019-10-24 13:37:03 +0200
commitf3035cf29958dbf21587a1bdb98eb9f692120d40 (patch)
treea7c6b73d687f8cd9ee1636ff716e2015dd372809 /arch/microblaze
parent4ab8d6328265da995401fcbfb8be5e20f660cfb0 (diff)
microblaze: Unify Linux bootm process
Record two bootstages and add "Starting kernel" message to have standard handoff message between U-Boot and OS. Also use debug() instead of #ifdef DEBUG to clean the code. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/lib/bootm.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
index 5650109d63..01c5d57bc5 100644
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -66,12 +66,15 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)
thekernel = (void (*)(char *, ulong, ulong))images->ep;
-#ifdef DEBUG
- printf("## Transferring control to Linux (at address 0x%08lx) ",
- (ulong)thekernel);
- printf("cmdline 0x%08lx, ramdisk 0x%08lx, FDT 0x%08lx...\n",
- cmdline, rd_start, dt);
-#endif
+ debug("## Transferring control to Linux (at address 0x%08lx) ",
+ (ulong)thekernel);
+ debug("cmdline 0x%08lx, ramdisk 0x%08lx, FDT 0x%08lx...\n",
+ cmdline, rd_start, dt);
+ bootstage_mark(BOOTSTAGE_ID_RUN_OS);
+
+ printf("\nStarting kernel ...%s\n\n", fake ?
+ "(fake run for tracing)" : "");
+ bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel");
#ifdef XILINX_USE_DCACHE
flush_cache(0, XILINX_DCACHE_BYTE_SIZE);