diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-20 08:55:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-20 08:55:18 -0400 |
| commit | 1f9c3f13f6ad8595a0fb5ab2cb830583cdc0b60a (patch) | |
| tree | 5ca30add717db7f20f70ff53acfb0875df805634 /cmd/load.c | |
| parent | 65f2e55b578779dcddc94f625762e08b11e4b018 (diff) | |
| parent | 76b0a19022e22a5bbb84cd76d516bdb625a70417 (diff) | |
Merge tag 'efi-2021-04-rc5-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2021-04-rc5-2
Bug fixes:
* re-enable loading UEFI binaries via UART
* fix a NULL dereference in EFI console
Diffstat (limited to 'cmd/load.c')
| -rw-r--r-- | cmd/load.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cmd/load.c b/cmd/load.c index 5bbc39baead..b7894d7db02 100644 --- a/cmd/load.c +++ b/cmd/load.c @@ -11,12 +11,14 @@ #include <command.h> #include <console.h> #include <cpu_func.h> +#include <efi_loader.h> #include <env.h> +#include <exports.h> #include <flash.h> #include <image.h> -#include <s_record.h> +#include <mapmem.h> #include <net.h> -#include <exports.h> +#include <s_record.h> #include <serial.h> #include <xyzModem.h> #include <asm/cache.h> @@ -996,6 +998,10 @@ static ulong load_serial_ymodem(ulong offset, int mode) } } + if (IS_ENABLED(CONFIG_CMD_BOOTEFI)) + efi_set_bootdev("Uart", "", "", + map_sysmem(offset, 0), size); + } else { printf("%s\n", xyzModem_error(err)); } |