efi: stub: Move the use_uart assignment immediately after exit_boot_services() call
authorBin Meng <bmeng.cn@gmail.com>
Fri, 22 Jun 2018 08:38:28 +0000 (01:38 -0700)
committerBin Meng <bmeng.cn@gmail.com>
Sun, 24 Jun 2018 00:56:04 +0000 (08:56 +0800)
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 <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
lib/efi/efi_stub.c

index 262fc56562f331584c2f0c07a746817f9e13eac3..1b495ec81b296601794be376f842522c945bd572 100644 (file)
@@ -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);