From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Date: Mon, 25 Apr 2022 21:35:01 +0000 (+0200)
Subject: efi_loader: simplify try_load_entry()
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=4f419960bff5bbc646e28da3f8c953455319ea16;p=u-boot.git

efi_loader: simplify try_load_entry()

Use function efi_create_indexed_name() to create the BootXXXX variable
name.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---

diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
index d1c14f1bbc..52bea4d541 100644
--- a/lib/efi_loader/efi_bootmgr.c
+++ b/lib/efi_loader/efi_bootmgr.c
@@ -46,16 +46,12 @@ static efi_status_t try_load_entry(u16 n, efi_handle_t *handle,
 				   void **load_options)
 {
 	struct efi_load_option lo;
-	u16 varname[] = u"Boot0000";
-	u16 hexmap[] = u"0123456789ABCDEF";
+	u16 varname[9];
 	void *load_option;
 	efi_uintn_t size;
 	efi_status_t ret;
 
-	varname[4] = hexmap[(n & 0xf000) >> 12];
-	varname[5] = hexmap[(n & 0x0f00) >> 8];
-	varname[6] = hexmap[(n & 0x00f0) >> 4];
-	varname[7] = hexmap[(n & 0x000f) >> 0];
+	efi_create_indexed_name(varname, sizeof(varname), "Boot", n);
 
 	load_option = efi_get_var(varname, &efi_global_variable_guid, &size);
 	if (!load_option)