efi_loader: build with HII configuration protocol

Without the HII configuration protocol the debug version of the UEFI shell
cannot be used.

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

diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index ab50a69e48b48265b1133c0fe1e52f4e8f7412e5..cf050e5385dd3b4d594d03fb402f6cd4b99361af 100644 (file)
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@@ -37,7 +37,7 @@ obj-$(CONFIG_EFI_DEVICE_PATH_UTIL) += efi_device_path_utilities.o
 obj-y += efi_dt_fixup.o
 obj-y += efi_fdt.o
 obj-y += efi_file.o
-obj-$(CONFIG_EFI_LOADER_HII) += efi_hii.o
+obj-$(CONFIG_EFI_LOADER_HII) += efi_hii.o efi_hii_config.o
 obj-y += efi_image_loader.o
 obj-y += efi_load_options.o
 obj-y += efi_memory.o

diff --git a/lib/efi_loader/efi_hii_config.c b/lib/efi_loader/efi_hii_config.c
index 37d8c6629e2c24235f62d2fd0d83b91a060f7b66..521481a86d826733f4f7bf46380392e8b7e72ac6 100644 (file)
--- a/lib/efi_loader/efi_hii_config.c
+++ b/lib/efi_loader/efi_hii_config.c
@@ -4,10 +4,6 @@
  *
  * Copyright (c) 2017 Leif Lindholm
  * Copyright (c) 2018 AKASHI Takahiro, Linaro Limited
- *
- * As this is still a non-working stub and the protocol is neither required
- * by the EFI shell nor by the UEFI SCT this module has been removed from
- * the Makefile.
  */
 
 #define LOG_CATEGORY LOGC_EFI

diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c
index 74225edad295847d9b1e769741f3b4957842ad03..e5246f65df26d14a00d1ad7c98295ece606aa165 100644 (file)
--- a/lib/efi_loader/efi_root_node.c
+++ b/lib/efi_loader/efi_root_node.c
@@ -80,6 +80,9 @@ efi_status_t efi_root_node_register(void)
                 /* HII database protocol */
                 &efi_guid_hii_database_protocol,
                 &efi_hii_database,
+                /* EFI HII Configuration Routing Protocol */
+                &efi_guid_hii_config_routing_protocol,
+                &efi_hii_config_routing,
 #endif
                 NULL);
        efi_root->type = EFI_OBJECT_TYPE_U_BOOT_FIRMWARE;