[PATCH 2/4] efi_loader: build with HII configuration protocol

[Heinrich Schuchardt]

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

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>
---
 lib/efi_loader/Makefile         | 2 +-
 lib/efi_loader/efi_hii_config.c | 4 ----
 lib/efi_loader/efi_root_node.c  | 3 +++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
index 7d1f04e9fbd..195ed8667fe 100644
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@@ -36,7 +36,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-$(CONFIG_EFI_HOB) += efi_hob.o
 obj-y += efi_image_loader.o
 obj-y += efi_load_options.o
diff --git a/lib/efi_loader/efi_hii_config.c b/lib/efi_loader/efi_hii_config.c
index ae0f3ecd3b1..54a72d573be 100644
--- 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.
  */
 
 #include <efi_loader.h>
diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c
index 4d7fb74b5d6..426f77cb2ad 100644
--- a/lib/efi_loader/efi_root_node.c
+++ b/lib/efi_loader/efi_root_node.c
@@ -78,6 +78,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;
-- 
2.47.1