Browse Source

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>
Michal Simek 4 years ago
parent
commit
f3035cf299
1 changed files with 9 additions and 6 deletions
  1. 9 6
      arch/microblaze/lib/bootm.c

+ 9 - 6
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);