From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Date: Sat, 18 Nov 2023 11:40:32 +0000 (+0100)
Subject: cmd: eficonfig: create shortened boot options
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=64658007f3c61e32bf241f3048a23b1728774d57;p=u-boot.git

cmd: eficonfig: create shortened boot options

The boot options created by eficonfig should use shortened device-paths to
avoid problems if drives are enumerated in a different sequence.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
---

diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c
index e6e8a0a488..34a59cb15d 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;