diff options
| author | Tom Rini <[email protected]> | 2018-06-23 21:47:39 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2018-06-23 21:47:39 -0400 |
| commit | 90efca253973944d7169932820e0bc6419b8cd7b (patch) | |
| tree | a7a80923c54aca218d30980a8ed8f607acf489a0 /lib | |
| parent | 77b5ba5d2b94c5b028991c82782493f64bd4f392 (diff) | |
| parent | dd099ec44b5d0a5d2dff537fc5b3b3441a49eec6 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi/Makefile | 4 | ||||
| -rw-r--r-- | lib/efi/efi_stub.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/efi/Makefile b/lib/efi/Makefile index f1a3929e32b..a790d2d554c 100644 --- a/lib/efi/Makefile +++ b/lib/efi/Makefile @@ -7,11 +7,11 @@ obj-$(CONFIG_EFI_STUB) += efi_info.o CFLAGS_REMOVE_efi_stub.o := -mregparm=3 \ $(if $(CONFIG_EFI_STUB_64BIT),-march=i386 -m32) -CFLAGS_efi_stub.o := -fpic -fshort-wchar -DEFI_STUB \ +CFLAGS_efi_stub.o := -fpic -fshort-wchar \ $(if $(CONFIG_EFI_STUB_64BIT),-m64) CFLAGS_REMOVE_efi.o := -mregparm=3 \ $(if $(CONFIG_EFI_STUB_64BIT),-march=i386 -m32) -CFLAGS_efi.o := -fpic -fshort-wchar -DEFI_STUB \ +CFLAGS_efi.o := -fpic -fshort-wchar \ $(if $(CONFIG_EFI_STUB_64BIT),-m64) extra-$(CONFIG_EFI_STUB) += efi_stub.o efi.o diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c index 262fc56562f..1b495ec81b2 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); |