diff options
| author | Tom Rini <[email protected]> | 2023-11-21 09:10:15 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-11-21 09:10:15 -0500 |
| commit | 9e53e45292ee2f1d9d2ccc59914b161bef9b10d7 (patch) | |
| tree | 7da5c6ed1f5986e20073ec4183480110d36933c6 /cmd | |
| parent | 24ca49b33af98d54d6cd2e845f071f6565345ffd (diff) | |
| parent | 64658007f3c61e32bf241f3048a23b1728774d57 (diff) | |
Merge tag 'efi-2024-01-rc4' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2024-01-rc4
Documentation
* Add HiSilicon board documentation to HTML docs
* Fix building with Sphinx 6.0
UEFI
* Increase default variable store size to 128K
* Check return value of efi_append_scrtm version
* Create shortened boot options in eficonfig command
Other
* Avoid incorrect error message in mkimage
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/eficonfig.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index e6e8a0a488e..34a59cb15d0 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -528,7 +528,10 @@ struct efi_device_path *eficonfig_create_device_path(struct efi_device_path *dp_ p += fp_size; *((struct efi_device_path *)p) = END; - dp = efi_dp_append(dp_volume, (struct efi_device_path *)buf); + dp = efi_dp_shorten(dp_volume); + if (!dp) + dp = dp_volume; + dp = efi_dp_append(dp, &fp->dp); free(buf); return dp; |