diff options
| author | Tom Rini <trini@konsulko.com> | 2018-06-13 11:43:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-06-13 11:43:59 -0400 |
| commit | 66398944f53921ec641e1c2202390933767dbb87 (patch) | |
| tree | e68f31898efc1f8963bcd37cb6703a61a9c5f76f /lib | |
| parent | acaee30608ce203289a180d664b7f0abb2e64ee7 (diff) | |
| parent | bee053e248e93d82e5c352708f8c892f4a488c54 (diff) | |
| download | u-boot-66398944f53921ec641e1c2202390933767dbb87.tar.gz u-boot-66398944f53921ec641e1c2202390933767dbb87.tar.xz u-boot-66398944f53921ec641e1c2202390933767dbb87.zip | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi/Makefile | 6 | ||||
| -rw-r--r-- | lib/efi/efi_stub.c | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lib/efi/Makefile b/lib/efi/Makefile index 18d081ac46..f1a3929e32 100644 --- a/lib/efi/Makefile +++ b/lib/efi/Makefile @@ -7,9 +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 -DEFI_STUB \ + $(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 -DEFI_STUB \ + $(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 3138739ee5..09023a2f67 100644 --- a/lib/efi/efi_stub.c +++ b/lib/efi/efi_stub.c @@ -281,7 +281,8 @@ efi_status_t efi_main(efi_handle_t image, struct efi_system_table *sys_table) ret = efi_init(priv, "Payload", image, sys_table); if (ret) { - printhex2(ret); puts(" efi_init() failed\n"); + printhex2(ret); + puts(" efi_init() failed\n"); return ret; } global_priv = priv; @@ -294,7 +295,8 @@ efi_status_t efi_main(efi_handle_t image, struct efi_system_table *sys_table) size = 0; ret = boot->get_memory_map(&size, NULL, &key, &desc_size, &version); if (ret != EFI_BUFFER_TOO_SMALL) { - printhex2(BITS_PER_LONG); + printhex2(EFI_BITS_PER_LONG); + putc(' '); printhex2(ret); puts(" No memory map\n"); return ret; @@ -303,7 +305,7 @@ efi_status_t efi_main(efi_handle_t image, struct efi_system_table *sys_table) desc = efi_malloc(priv, size, &ret); if (!desc) { printhex2(ret); - puts(" No memory for memory descriptor: "); + puts(" No memory for memory descriptor\n"); return ret; } ret = setup_info_table(priv, size + 128); |