colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

efi_loader: allow concatenation with contained end node

Browse Source 
Allow appending a device-path to a device-path that contains an end node
as separator. We need this feature for creating boot options specifying
kernel, initrd, and dtb.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
Heinrich Schuchardt
2024-05-24 14:54:26 +02:00
parent 4f836fb324
commit bf03333d09
8 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/efidebug.c
View File

@@ -696,7 +696,7 @@ struct efi_device_path *create_initrd_dp(const char *dev, const char *part,
short_fp = tmp_fp;
initrd_dp = efi_dp_concat((const struct efi_device_path *)&id_dp,
short_fp, false);
short_fp, 0);
out:
efi_free_pool(tmp_dp);
@@ -916,7 +916,7 @@ static int do_efi_boot_add(struct cmd_tbl *cmdtp, int flag,
goto out;
}
final_fp = efi_dp_concat(file_path, initrd_dp, true);
final_fp = efi_dp_concat(file_path, initrd_dp, 1);
if (!final_fp) {
printf("Cannot create final device path\n");
r = CMD_RET_FAILURE;