From: Simon Glass <[email protected]> Mark kernel start before booting. If enabled, show a bootstage report.
Signed-off-by: Simon Glass <[email protected]> Signed-off-by: Simon Glass <[email protected]> --- boot/bootm_final.c | 6 ++++++ test/boot/bootflow.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/boot/bootm_final.c b/boot/bootm_final.c index 71661334e11..dd7cac55f1e 100644 --- a/boot/bootm_final.c +++ b/boot/bootm_final.c @@ -6,11 +6,17 @@ */ #include <bootm.h> +#include <bootstage.h> #include <dm/root.h> void bootm_final(enum bootm_final_t flags) { printf("\nStarting kernel ...\n\n"); + bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel"); + + if (IS_ENABLED(CONFIG_BOOTSTAGE_REPORT)) + bootstage_report(); + dm_remove_devices_active(); } diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index a56435d053f..80adc074070 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -1381,7 +1381,7 @@ static int bootflow_efi(struct unit_test_state *uts) /* TODO: Why the \r ? */ ut_assert_nextline("U-Boot test app for EFI_LOADER\r"); - ut_assert_nextline("Exiting test app"); + ut_assert_skip_to_line("Exiting test app"); ut_assert_nextline("Boot failed (err=-14)"); ut_assert_console_end(); -- 2.43.0
