From: Simon Glass <sjg@chromium.org> This function is called just before boot, so move it from EFI into the common bootm_final() function. Signed-off-by: Simon Glass <sjg@chromium.org> --- boot/bootm.c | 4 ---- boot/bootm_final.c | 6 ++++++ lib/efi_loader/efi_boottime.c | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/boot/bootm.c b/boot/bootm.c index bd45ae42fe9..7d7c971207c 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -46,10 +46,6 @@ DECLARE_GLOBAL_DATA_PTR; struct bootm_headers images; /* pointers to os/initrd/fdt images */ -__weak void board_quiesce_devices(void) -{ -} - #if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT) /** * image_get_kernel - verify legacy format kernel image diff --git a/boot/bootm_final.c b/boot/bootm_final.c index bf53c112c19..466bb55debe 100644 --- a/boot/bootm_final.c +++ b/boot/bootm_final.c @@ -10,6 +10,10 @@ #include <usb.h> #include <dm/root.h> +__weak void board_quiesce_devices(void) +{ +} + void bootm_final(enum bootm_final_t flags) { printf("\nStarting kernel ...%s\n\n", flags & BOOTM_FINAL_FAKE ? @@ -22,6 +26,8 @@ void bootm_final(enum bootm_final_t flags) if (IS_ENABLED(CONFIG_BOOTSTAGE_REPORT)) bootstage_report(); + board_quiesce_devices(); + if (IS_ENABLED(CONFIG_USB_DEVICE)) udc_disconnect(); diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 2a02029f243..6cf430da766 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -2230,7 +2230,6 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle, if (!efi_st_keep_devices) { bootm_disable_interrupts(); - board_quiesce_devices(); bootm_final(BOOTM_FINAL_NO_CLEANUP); } -- 2.43.0