Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f3035cf29958dbf21587a1bdb98eb9f692120d40

Authored by Michal Simek
1 parent 4ab8d63282
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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>

Showing 1 changed file with 9 additions and 6 deletions Side-by-side Diff

arch/microblaze/lib/bootm.c
Diff comments   View file @ f3035cf
... ... @@ -66,12 +66,15 @@
66 66  
67 67 thekernel = (void (*)(char *, ulong, ulong))images->ep;
68 68  
69   -#ifdef DEBUG
70   - printf("## Transferring control to Linux (at address 0x%08lx) ",
71   - (ulong)thekernel);
72   - printf("cmdline 0x%08lx, ramdisk 0x%08lx, FDT 0x%08lx...\n",
73   - cmdline, rd_start, dt);
74   -#endif
  69 + debug("## Transferring control to Linux (at address 0x%08lx) ",
  70 + (ulong)thekernel);
  71 + debug("cmdline 0x%08lx, ramdisk 0x%08lx, FDT 0x%08lx...\n",
  72 + cmdline, rd_start, dt);
  73 + bootstage_mark(BOOTSTAGE_ID_RUN_OS);
  74 +
  75 + printf("\nStarting kernel ...%s\n\n", fake ?
  76 + "(fake run for tracing)" : "");
  77 + bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel");
75 78  
76 79 #ifdef XILINX_USE_DCACHE
77 80 flush_cache(0, XILINX_DCACHE_BYTE_SIZE);