From: Bin Meng Date: Fri, 22 Jun 2018 08:38:28 +0000 (-0700) Subject: efi: stub: Move the use_uart assignment immediately after exit_boot_services() call X-Git-Tag: v2018.07-rc3~18^2~3 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7c98ca10eae855571b16cddb19d461a981052730;p=oweals%2Fu-boot.git efi: stub: Move the use_uart assignment immediately after exit_boot_services() call The use_uart assignment should follow immediately after the call to exit_boot_services(), in case we want some debug output after that. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c index 262fc56562..1b495ec81b 100644 --- a/lib/efi/efi_stub.c +++ b/lib/efi/efi_stub.c @@ -361,14 +361,14 @@ efi_status_t EFIAPI efi_main(efi_handle_t image, } } + /* The EFI UART won't work now, switch to a debug one */ + use_uart = true; + map.version = version; map.desc_size = desc_size; add_entry_addr(priv, EFIET_MEMORY_MAP, &map, sizeof(map), desc, size); add_entry_addr(priv, EFIET_END, NULL, 0, 0, 0); - /* The EFI UART won't work now, switch to a debug one */ - use_uart = true; - memcpy((void *)CONFIG_SYS_TEXT_BASE, _binary_u_boot_bin_start, (ulong)_binary_u_boot_bin_end - (ulong)_binary_u_boot_bin_start);