summaryrefslogtreecommitdiff
path: root/lib/efi_loader/efi_root_node.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-04-24 12:26:58 -0400
committerTom Rini <trini@konsulko.com>2019-04-24 12:26:58 -0400
commit180e38ad2dbb3340cc71fb4fa335a68f2a4122ef (patch)
tree7b52b6a9ba7948efa7780248836cf97ddebd9c65 /lib/efi_loader/efi_root_node.c
parentc2bb9c5b9e333c200e3702d9ed5ac9b6095191b6 (diff)
parent7d1e4b73e3f321cd4f0e039aa0387484cf97b25c (diff)
Merge tag 'efi-2019-07-rc1-3' of git://git.denx.de/u-boot-efi
Pull request for UEFI sub-system for v2019.07-rc1 (3) This patch series reworks the implementation of the `bootefi` command to remove code duplication by using the LoadImage() boot service to load binaries. Missing short texts for UEFI protocols are added for display by the `efidebug dh` command. Missing parameter checks for AllocatePages() and CreateDeviceNode() are implemented. The constants for protocol GUIDs are changed to match the names in the UEFI specification.
Diffstat (limited to 'lib/efi_loader/efi_root_node.c')
-rw-r--r--lib/efi_loader/efi_root_node.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c
index 392f5c49513..e0fcbb85a4d 100644
--- a/lib/efi_loader/efi_root_node.c
+++ b/lib/efi_loader/efi_root_node.c
@@ -11,6 +11,8 @@
const efi_guid_t efi_u_boot_guid = U_BOOT_GUID;
+efi_handle_t efi_root = NULL;
+
struct efi_root_dp {
struct efi_device_path_vendor vendor;
struct efi_device_path end;
@@ -26,7 +28,6 @@ struct efi_root_dp {
*/
efi_status_t efi_root_node_register(void)
{
- efi_handle_t root = NULL;
struct efi_root_dp *dp;
/* Create device path protocol */
@@ -46,7 +47,7 @@ efi_status_t efi_root_node_register(void)
dp->end.length = sizeof(struct efi_device_path);
/* Create root node and install protocols */
- return EFI_CALL(efi_install_multiple_protocol_interfaces(&root,
+ return EFI_CALL(efi_install_multiple_protocol_interfaces(&efi_root,
/* Device path protocol */
&efi_guid_device_path, dp,
/* Device path to text protocol */