From: Simon Glass <sjg@chromium.org> Call this function from the EFI code. Add the required call to dm_remove_devices_active() there. Signed-off-by: Simon Glass <sjg@chromium.org> --- boot/bootm_final.c | 2 ++ lib/efi_loader/efi_boottime.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/boot/bootm_final.c b/boot/bootm_final.c index 15ddbbe5e74..263cd95dcb3 100644 --- a/boot/bootm_final.c +++ b/boot/bootm_final.c @@ -6,7 +6,9 @@ */ #include <bootm.h> +#include <dm/root.h> void bootm_final(enum bootm_final_t flags) { + dm_remove_devices_active(); } diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index c51694399e7..36012c177a6 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -2256,7 +2256,7 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle, if (IS_ENABLED(CONFIG_USB_DEVICE)) udc_disconnect(); board_quiesce_devices(); - dm_remove_devices_active(); + bootm_final(0); } /* Patch out unsupported runtime function */ -- 2.43.0