diff options
| author | Tom Rini <[email protected]> | 2025-05-25 09:14:07 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-05-25 09:14:07 -0600 |
| commit | 92da174fc6367c6398bda9950b40598f57bd43da (patch) | |
| tree | 245cf5035b0e115368d2eb0df6a2a38dc5100e66 /cmd | |
| parent | df2ed552f0b05591090369a7fe7ddc92439dea5c (diff) | |
| parent | f8949b1d1d0d4dc4d5abb458c59e831b9e2a0dca (diff) | |
Merge tag 'efi-2025-07-rc3-3' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2025-07-rc3-3
CI:
* https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/26313
UEFI:
* run dhcp if an http boot option is selected
* separate device path into its own header and add it to the API docs
* rename END to EFI_DP_END
* make x86 SMBIOS tables usable in the EFI context
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/bootefi.c | 1 | ||||
| -rw-r--r-- | cmd/eficonfig.c | 5 | ||||
| -rw-r--r-- | cmd/efidebug.c | 7 |
3 files changed, 8 insertions, 5 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index cea6d356ee6..8e8752127ed 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -9,6 +9,7 @@ #include <command.h> #include <efi.h> +#include <efi_device_path.h> #include <efi_loader.h> #include <exports.h> #include <log.h> diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index 629bf1b82c7..6e14d34a6bd 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -8,6 +8,7 @@ #include <ansi.h> #include <cli.h> #include <charset.h> +#include <efi_device_path.h> #include <efi_loader.h> #include <efi_load_initrd.h> #include <efi_config.h> @@ -514,7 +515,7 @@ struct efi_device_path *eficonfig_create_device_path(struct efi_device_path *dp_ struct efi_device_path_file_path *fp; fp_size = sizeof(struct efi_device_path) + u16_strsize(current_path); - buf = calloc(1, fp_size + sizeof(END)); + buf = calloc(1, fp_size + sizeof(EFI_DP_END)); if (!buf) return NULL; @@ -526,7 +527,7 @@ struct efi_device_path *eficonfig_create_device_path(struct efi_device_path *dp_ p = buf; p += fp_size; - *((struct efi_device_path *)p) = END; + *((struct efi_device_path *)p) = EFI_DP_END; dp = efi_dp_shorten(dp_volume); if (!dp) diff --git a/cmd/efidebug.c b/cmd/efidebug.c index 2461425e291..109496d9e95 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -8,6 +8,7 @@ #include <charset.h> #include <command.h> #include <dm/device.h> +#include <efi_device_path.h> #include <efi_dt_fixup.h> #include <efi_load_initrd.h> #include <efi_loader.h> @@ -812,7 +813,7 @@ static int efi_boot_add_uri(int argc, char *const argv[], u16 *var_name16, lo->label = label; uridp_len = sizeof(struct efi_device_path) + strlen(argv[3]) + 1; - uridp = efi_alloc(uridp_len + sizeof(END)); + uridp = efi_alloc(uridp_len + sizeof(EFI_DP_END)); if (!uridp) { log_err("Out of memory\n"); return CMD_RET_FAILURE; @@ -822,10 +823,10 @@ static int efi_boot_add_uri(int argc, char *const argv[], u16 *var_name16, uridp->dp.length = uridp_len; strcpy(uridp->uri, argv[3]); pos = (char *)uridp + uridp_len; - memcpy(pos, &END, sizeof(END)); + memcpy(pos, &EFI_DP_END, sizeof(EFI_DP_END)); *file_path = &uridp->dp; - *fp_size += uridp_len + sizeof(END); + *fp_size += uridp_len + sizeof(EFI_DP_END); return CMD_RET_SUCCESS; } |