From: Simon Glass <sjg@chromium.org> Now that bootm_final() does most of what we want, drop this separate function. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/x86/cpu/cpu.c | 2 +- arch/x86/include/asm/bootm.h | 2 -- arch/x86/lib/bootm.c | 13 ++++--------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index f756a9ebf09..d7aaf496c51 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -246,7 +246,7 @@ static int last_stage_init(void) } /* - * TODO(sjg@chromium.org): Move this to bootm_announce_and_cleanup() + * TODO(sjg@chromium.org): Move this to boot_linux_kernel() * once APL FSP-S at 0x200000 does not overlap with the bzimage at * 0x100000. */ diff --git a/arch/x86/include/asm/bootm.h b/arch/x86/include/asm/bootm.h index 3b641783b9c..835aa5592df 100644 --- a/arch/x86/include/asm/bootm.h +++ b/arch/x86/include/asm/bootm.h @@ -6,8 +6,6 @@ #ifndef ARM_BOOTM_H #define ARM_BOOTM_H -void bootm_announce_and_cleanup(void); - /** * boot_linux_kernel() - boot a linux kernel * diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index fc408d9685c..2dace1b0c45 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -34,14 +34,6 @@ DECLARE_GLOBAL_DATA_PTR; #define COMMAND_LINE_OFFSET 0x9000 -void bootm_announce_and_cleanup(void) -{ -#ifdef CONFIG_SYS_COREBOOT - timestamp_add_now(TS_START_KERNEL); -#endif - bootm_final(0); -} - #if defined(CONFIG_OF_LIBFDT) && !defined(CONFIG_OF_NO_KERNEL) int arch_fixup_memory_node(void *blob) { @@ -181,7 +173,10 @@ int efi_boot(ulong setup_base, ulong entry, bool image_64bit) int boot_linux_kernel(ulong setup_base, ulong entry, bool image_64bit) { - bootm_announce_and_cleanup(); +#ifdef CONFIG_SYS_COREBOOT + timestamp_add_now(TS_START_KERNEL); +#endif + bootm_final(0); #ifdef CONFIG_SYS_COREBOOT timestamp_add_now(TS_U_BOOT_START_KERNEL); -- 2.43.0