diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-25 09:04:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-25 09:04:01 -0400 |
| commit | 0ac83d080a0044cd0d8f782ba12f02cf969d3004 (patch) | |
| tree | ca5c2351113ba9b56d59e241a8857c7e6e8f5604 /arch/x86/lib/bootm.c | |
| parent | 67ece26d8b5d4bfa4fda8c456261c465d0815d7d (diff) | |
| parent | 8c180d669a0f4a8eb70bde8c74c73cef45993f67 (diff) | |
Merge branch 'next' of https://gitlab.denx.de/u-boot/custodians/u-boot-x86 into next
- Enhance the 'zboot' command to be more like 'bootm' with sub-commands
- The last series of ACPI core changes for programmatic generation of
ACPI tables
- Add all required ACPI tables for ApolloLake and enable ACPIGEN on
Chromebook Coral
- A feature minor enhancements to the 'hob' command
- Intel edison: Support for writing an xFSTK image via binman
Diffstat (limited to 'arch/x86/lib/bootm.c')
| -rw-r--r-- | arch/x86/lib/bootm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 1198a52ecac..da6b8ce1ec1 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -136,7 +136,7 @@ static int boot_prep_linux(bootm_headers_t *images) printf("Setup at %#08lx\n", images->ep); ret = setup_zimage((void *)images->ep, cmd_line_dest, 0, images->rd_start, - images->rd_end - images->rd_start); + images->rd_end - images->rd_start, 0); if (ret) { printf("## Setting up boot parameters failed ...\n"); |