[PATCH v10 04/10] efi_loader: Move get_efi_pxe_arch() to efi_helper

[Simon Glass]

Move this function from the EFI bootmeth to the common efi_helper file.
No functional change is intended.

Signed-off-by: Simon Glass <s...@chromium.org>
---

(no changes since v9)

Changes in v9:
- Split out into a separate change

 boot/bootmeth_efi.c         | 25 ++-----------------------
 include/efi.h               | 10 ++++++++++
 lib/efi_loader/efi_helper.c | 23 +++++++++++++++++++++++
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c
index 371b36d550b..f836aa655f5 100644
--- a/boot/bootmeth_efi.c
+++ b/boot/bootmeth_efi.c
@@ -25,32 +25,11 @@
 
 #define EFI_DIRNAME    "/EFI/BOOT/"
 
-static int get_efi_pxe_arch(void)
-{
-       /* 
http://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xml */
-       if (IS_ENABLED(CONFIG_ARM64))
-               return 0xb;
-       else if (IS_ENABLED(CONFIG_ARM))
-               return 0xa;
-       else if (IS_ENABLED(CONFIG_X86_64))
-               return 0x6;
-       else if (IS_ENABLED(CONFIG_X86))
-               return 0x7;
-       else if (IS_ENABLED(CONFIG_ARCH_RV32I))
-               return 0x19;
-       else if (IS_ENABLED(CONFIG_ARCH_RV64I))
-               return 0x1b;
-       else if (IS_ENABLED(CONFIG_SANDBOX))
-               return 0;       /* not used */
-
-       return -EINVAL;
-}
-
 static int get_efi_pxe_vci(char *str, int max_len)
 {
        int ret;
 
-       ret = get_efi_pxe_arch();
+       ret = efi_get_pxe_arch();
        if (ret < 0)
                return ret;
 
@@ -239,7 +218,7 @@ static int distro_efi_read_bootflow_net(struct bootflow 
*bflow)
        ret = get_efi_pxe_vci(str, sizeof(str));
        if (ret)
                return log_msg_ret("vci", ret);
-       ret = get_efi_pxe_arch();
+       ret = efi_get_pxe_arch();
        if (ret < 0)
                return log_msg_ret("arc", ret);
        arch = ret;
diff --git a/include/efi.h b/include/efi.h
index ecdf7210750..789a64eda9d 100644
--- a/include/efi.h
+++ b/include/efi.h
@@ -678,4 +678,14 @@ void efi_show_tables(struct efi_system_table *systab);
  */
 const char *efi_get_basename(void);
 
+/**
+ * efi_get_pxe_arch() - Get the architecture value for PXE
+ *
+ * See:
+ * http://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xml
+ *
+ * Return: Architecture value
+ */
+int efi_get_pxe_arch(void);
+
 #endif /* _LINUX_EFI_H */
diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c
index 51e0c4852c5..b8ece1c2e0c 100644
--- a/lib/efi_loader/efi_helper.c
+++ b/lib/efi_loader/efi_helper.c
@@ -21,6 +21,8 @@
 #include <linux/libfdt.h>
 #include <linux/list.h>
 
+#undef BOOTEFI_NAME
+
 #ifdef CONFIG_SANDBOX
 
 #if HOST_ARCH == HOST_ARCH_X86_64
@@ -69,6 +71,27 @@ const char *efi_get_basename(void)
        return BOOTEFI_NAME;
 }
 
+int efi_get_pxe_arch(void)
+{
+       /* 
http://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.xml */
+       if (IS_ENABLED(CONFIG_ARM64))
+               return 0xb;
+       else if (IS_ENABLED(CONFIG_ARM))
+               return 0xa;
+       else if (IS_ENABLED(CONFIG_X86_64))
+               return 0x6;
+       else if (IS_ENABLED(CONFIG_X86))
+               return 0x7;
+       else if (IS_ENABLED(CONFIG_ARCH_RV32I))
+               return 0x19;
+       else if (IS_ENABLED(CONFIG_ARCH_RV64I))
+               return 0x1b;
+       else if (IS_ENABLED(CONFIG_SANDBOX))
+               return 0;       /* not used */
+
+       return -EINVAL;
+}
+
 /**
  * efi_create_current_boot_var() - Return Boot#### name were #### is replaced 
by
  *                                the value of BootCurrent
-- 
2.34.1