From: Simon Glass <sjg@chromium.org> The x86 code in bootm_announce_and_cleanup() is very similar to the new bootm_final() function, so just use the latter. Move over a useful comment. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/x86/lib/bootm.c | 14 +------------- boot/bootm_final.c | 5 +++++ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index ce4dae871ec..fc408d9685c 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -36,22 +36,10 @@ DECLARE_GLOBAL_DATA_PTR; void bootm_announce_and_cleanup(void) { - printf("\nStarting kernel ...\n\n"); - #ifdef CONFIG_SYS_COREBOOT timestamp_add_now(TS_START_KERNEL); #endif - bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel"); -#if IS_ENABLED(CONFIG_BOOTSTAGE_REPORT) - bootstage_report(); -#endif - - /* - * Call remove function of all devices with a removal flag set. - * This may be useful for last-stage operations, like cancelling - * of DMA operation or releasing device internal buffers. - */ - dm_remove_devices_active(); + bootm_final(0); } #if defined(CONFIG_OF_LIBFDT) && !defined(CONFIG_OF_NO_KERNEL) diff --git a/boot/bootm_final.c b/boot/bootm_final.c index dd7cac55f1e..7077702d8c7 100644 --- a/boot/bootm_final.c +++ b/boot/bootm_final.c @@ -18,5 +18,10 @@ void bootm_final(enum bootm_final_t flags) if (IS_ENABLED(CONFIG_BOOTSTAGE_REPORT)) bootstage_report(); + /* + * Call remove function of all devices with a removal flag set. + * This may be useful for last-stage operations, like cancelling + * of DMA operation or releasing device internal buffers. + */ dm_remove_devices_active(); } -- 2.43.0