mirror of
https://github.com/u-boot/u-boot.git
synced 2025-05-08 19:11:53 +00:00
efi_loader: allow concatenation with contained end node
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:
parent
4f836fb324
commit
bf03333d09
8 changed files with 23 additions and 17 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue