efi_loader: move efi_init_obj_list() to a new efi_setup.c

The function, efi_init_obj_list(), can be shared in different pseudo efi
applications, like bootefi/bootmgr as well as my efishell. Moreover, it
will be utilized to extend efi initialization, for example, my "removable
disk support" patch and "capsule-on-disk support" patch in the future.

So with this patch, it will be moved to a new file, efi_setup.c, under
lib/efi_loader and exported, making no changes in functionality.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Remove lines deactivated by #if 1 #else
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 7ab08382faf5fa129844055dbb22f5ccae75be03..bcdd29ebed03615d45bd4b8f48b6c53aed92b57c 100644 (file)
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -28,86 +28,9 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define OBJ_LIST_NOT_INITIALIZED 1
-
-static efi_status_t efi_obj_list_initialized = OBJ_LIST_NOT_INITIALIZED;
-
 static struct efi_device_path *bootefi_image_path;
 static struct efi_device_path *bootefi_device_path;
 
-/* Initialize and populate EFI object list */
-efi_status_t efi_init_obj_list(void)
-{
-       efi_status_t ret = EFI_SUCCESS;
-
-       /*
-        * On the ARM architecture gd is mapped to a fixed register (r9 or x18).
-        * As this register may be overwritten by an EFI payload we save it here
-        * and restore it on every callback entered.
-        */
-       efi_save_gd();
-
-       /* Initialize once only */
-       if (efi_obj_list_initialized != OBJ_LIST_NOT_INITIALIZED)
-               return efi_obj_list_initialized;
-
-       /* Initialize system table */
-       ret = efi_initialize_system_table();
-       if (ret != EFI_SUCCESS)
-               goto out;
-
-       /* Initialize root node */
-       ret = efi_root_node_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-
-       /* Initialize EFI driver uclass */
-       ret = efi_driver_init();
-       if (ret != EFI_SUCCESS)
-               goto out;
-
-       ret = efi_console_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-#ifdef CONFIG_PARTITIONS
-       ret = efi_disk_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-#endif
-#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
-       ret = efi_gop_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-#endif
-#ifdef CONFIG_NET
-       ret = efi_net_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-#endif
-#ifdef CONFIG_GENERATE_ACPI_TABLE
-       ret = efi_acpi_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-#endif
-#ifdef CONFIG_GENERATE_SMBIOS_TABLE
-       ret = efi_smbios_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-#endif
-       ret = efi_watchdog_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-
-       /* Initialize EFI runtime services */
-       ret = efi_reset_system_init();
-       if (ret != EFI_SUCCESS)
-               goto out;
-
-out:
-       efi_obj_list_initialized = ret;
-       return ret;
-}
-
 /*
  * Allow unaligned memory access.
  *

diff --git a/include/efi_loader.h b/include/efi_loader.h
index 53f08161ab6563742dac90ef28fe49383893d3cc..6323686f9d37f5cbe767eb4f3d8673544fb30776 100644 (file)
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -244,6 +244,8 @@ extern struct list_head efi_obj_list;
 /* List of all events */
 extern struct list_head efi_events;
 
+/* Initialize efi execution environment */
+efi_status_t efi_init_obj_list(void);
 /* Called by bootefi to initialize root node */
 efi_status_t efi_root_node_register(void);
 /* Called by bootefi to initialize runtime */

diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index 6703435947f265713f05d4961e00d8f2d41743ec..a7bba58d41261bba410f12ae0a716e4bfd2963df 100644 (file)
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@@ -28,6 +28,7 @@ obj-y += efi_image_loader.o
 obj-y += efi_memory.o
 obj-y += efi_root_node.o
 obj-y += efi_runtime.o
+obj-y += efi_setup.o
 obj-y += efi_unicode_collation.o
 obj-y += efi_variable.o
 obj-y += efi_watchdog.o

diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
new file mode 100644 (file)
index 0000000..8266d06
--- /dev/null
+++ b/lib/efi_loader/efi_setup.c
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ *  EFI setup code
+ *
+ *  Copyright (c) 2016-2018 Alexander Graf et al.
+ */
+
+#include <common.h>
+#include <efi_loader.h>
+
+#define OBJ_LIST_NOT_INITIALIZED 1
+
+static efi_status_t efi_obj_list_initialized = OBJ_LIST_NOT_INITIALIZED;
+
+/* Initialize and populate EFI object list */
+efi_status_t efi_init_obj_list(void)
+{
+       efi_status_t ret = EFI_SUCCESS;
+
+       /*
+        * On the ARM architecture gd is mapped to a fixed register (r9 or x18).
+        * As this register may be overwritten by an EFI payload we save it here
+        * and restore it on every callback entered.
+        */
+       efi_save_gd();
+
+       /* Initialize once only */
+       if (efi_obj_list_initialized != OBJ_LIST_NOT_INITIALIZED)
+               return efi_obj_list_initialized;
+
+       /* Initialize system table */
+       ret = efi_initialize_system_table();
+       if (ret != EFI_SUCCESS)
+               goto out;
+
+       /* Initialize root node */
+       ret = efi_root_node_register();
+       if (ret != EFI_SUCCESS)
+               goto out;
+
+       /* Initialize EFI driver uclass */
+       ret = efi_driver_init();
+       if (ret != EFI_SUCCESS)
+               goto out;
+
+       ret = efi_console_register();
+       if (ret != EFI_SUCCESS)
+               goto out;
+#ifdef CONFIG_PARTITIONS
+       ret = efi_disk_register();
+       if (ret != EFI_SUCCESS)
+               goto out;
+#endif
+#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
+       ret = efi_gop_register();
+       if (ret != EFI_SUCCESS)
+               goto out;
+#endif
+#ifdef CONFIG_NET
+       ret = efi_net_register();
+       if (ret != EFI_SUCCESS)
+               goto out;
+#endif
+#ifdef CONFIG_GENERATE_ACPI_TABLE
+       ret = efi_acpi_register();
+       if (ret != EFI_SUCCESS)
+               goto out;
+#endif
+#ifdef CONFIG_GENERATE_SMBIOS_TABLE
+       ret = efi_smbios_register();
+       if (ret != EFI_SUCCESS)
+               goto out;
+#endif
+       ret = efi_watchdog_register();
+       if (ret != EFI_SUCCESS)
+               goto out;
+
+       /* Initialize EFI runtime services */
+       ret = efi_reset_system_init();
+       if (ret != EFI_SUCCESS)
+               goto out;
+
+out:
+       efi_obj_list_initialized = ret;
+       return ret;
+}