From bd18b69de10d1a681e760f2ee65b3de29d3006fd Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 30 Jul 2022 15:52:28 -0600 Subject: bootstd: Always create the EFI bootmgr bootmeth Now that we can separate this out from the normal bootmeths, update the code to create it always. We cannot rely on the device tree to create this, since the EFI project is quite opposed to having anything in the device tree that helps U-Boot with its processing. Signed-off-by: Simon Glass --- boot/bootstd-uclass.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'boot/bootstd-uclass.c') diff --git a/boot/bootstd-uclass.c b/boot/bootstd-uclass.c index 3c6c32ae604..5107b6d4c7f 100644 --- a/boot/bootstd-uclass.c +++ b/boot/bootstd-uclass.c @@ -133,12 +133,7 @@ int dm_scan_other(bool pre_reloc_only) return 0; for (i = 0; i < n_ents; i++, drv++) { - /* - * Disable EFI Manager for now as no one uses it so it is - * confusing - */ - if (drv->id == UCLASS_BOOTMETH && - strcmp("efi_mgr_bootmeth", drv->name)) { + if (drv->id == UCLASS_BOOTMETH) { const char *name = drv->name; if (!strncmp("bootmeth_", name, 9)) -- cgit v1.2.3 From 2ff5490d7dee933eaf0b73d4d50d76660e5da6ff Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 30 Jul 2022 15:52:29 -0600 Subject: bootstd: Drop the system bootdev This was a work-around for the fact that global bootmeths such as EFI bootmgr and VBE don't use a particular bootdev, or at least select it themselves so that we don't need to scan all bootdevs when using that bootmeth. Drop the system bootdev entirely. Signed-off-by: Simon Glass --- boot/bootstd-uclass.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'boot/bootstd-uclass.c') diff --git a/boot/bootstd-uclass.c b/boot/bootstd-uclass.c index 5107b6d4c7f..565c22a36e7 100644 --- a/boot/bootstd-uclass.c +++ b/boot/bootstd-uclass.c @@ -145,12 +145,6 @@ int dm_scan_other(bool pre_reloc_only) } } - /* Create the system bootdev too */ - ret = device_bind_driver(bootstd, "system_bootdev", "system-bootdev", - &dev); - if (ret) - return log_msg_ret("sys", ret); - return 0; } -- cgit v1.2.3