| Message ID | CAEUhbmVDpVQGST9PtKvkhZ00x8ysunZDA_hdycL1bJR5t0WwXQ@mail.gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] Please pull u-boot-x86 | expand |
On Sun, Jun 24, 2018 at 09:15:32AM +0800, Bin Meng wrote: > Hi Tom, > > This mainly fixes the broken EFI x86 payload support, and some other > small enhancements. > > The following changes since commit 77b5ba5d2b94c5b028991c82782493f64bd4f392: > > Merge branch 'master' of git://git.denx.de/u-boot-uniphier > (2018-06-22 13:12:53 -0400) > > are available in the git repository at: > > git://git.denx.de/u-boot-x86.git > > for you to fetch changes up to dd099ec44b5d0a5d2dff537fc5b3b3441a49eec6: > > cmd: efi: Fix wrong memory descriptor end address (2018-06-24 08:56:33 +0800) > Applied to u-boot/master, thanks!
Hi Tom, This mainly fixes the broken EFI x86 payload support, and some other small enhancements. The following changes since commit 77b5ba5d2b94c5b028991c82782493f64bd4f392: Merge branch 'master' of git://git.denx.de/u-boot-uniphier (2018-06-22 13:12:53 -0400) are available in the git repository at: git://git.denx.de/u-boot-x86.git for you to fetch changes up to dd099ec44b5d0a5d2dff537fc5b3b3441a49eec6: cmd: efi: Fix wrong memory descriptor end address (2018-06-24 08:56:33 +0800) ---------------------------------------------------------------- Alexander Graf (1): efi.h: Do not use config options Bin Meng (10): x86: efi-x86_app: Update MAINTAINERS x86: qemu: Change default vesa mode to 1024x768x32 board_r: Do not initialize IDE when DM BLK is on x86: efi-x86_payload: Enumerate PCI bus during early boot x86: efi-x86_payload: Enable usb keyboard during boot x86: Change __kernel_size_t conditionals to use compiler provided defines efi: stub: Move the use_uart assignment immediately after exit_boot_services() call x86: efi-x86_payload: Enable PRE_CONSOLE_BUFFER x86: efi: payload: Count in conventional memory above 4GB in DRAM bank cmd: efi: Fix wrong memory descriptor end address Heinrich Schuchardt (1): x86: qemu: do not build car.o with start64.o Ivan Gorinov (1): x86: Add 64-bit setjmp/longjmp implementation arch/x86/cpu/cpu.c | 2 +- arch/x86/cpu/efi/payload.c | 12 ++++++++++-- arch/x86/cpu/qemu/Makefile | 5 ++++- arch/x86/cpu/x86_64/setjmp.S | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ arch/x86/cpu/x86_64/setjmp.c | 19 ------------------- arch/x86/include/asm/posix_types.h | 3 ++- arch/x86/include/asm/setjmp.h | 17 +++++++++++++++++ board/efi/efi-x86_app/MAINTAINERS | 8 ++++---- board/efi/efi-x86_payload/Kconfig | 1 + board/efi/efi-x86_payload/Makefile | 2 +- board/efi/efi-x86_payload/payload.c | 18 ++++++++++++++++++ cmd/efi.c | 2 +- common/board_r.c | 4 ++-- configs/efi-x86_payload32_defconfig | 2 ++ configs/efi-x86_payload64_defconfig | 2 ++ configs/qemu-x86_64_defconfig | 3 ++- configs/qemu-x86_defconfig | 3 ++- include/configs/efi-x86_payload.h | 2 +- include/efi.h | 24 +++++++++++------------- lib/efi/Makefile | 4 ++-- lib/efi/efi_stub.c | 6 +++--- 21 files changed, 135 insertions(+), 53 deletions(-) create mode 100644 arch/x86/cpu/x86_64/setjmp.S delete mode 100644 arch/x86/cpu/x86_64/setjmp.c create mode 100644 board/efi/efi-x86_payload/payload.c Regards, Bin