diff options
author | Tom Rini <trini@konsulko.com> | 2022-08-12 12:51:14 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-08-12 12:51:14 -0400 |
commit | 6fc212779c990ff27a430e370bfb8fac01ddde7f (patch) | |
tree | 32ecaafa1d653e275683cfacac41dd2bb57efca1 /boot/bootstd-uclass.c | |
parent | f5003e0791dbe796bf7b41515d67ae5527679ec9 (diff) | |
parent | 5fe76d460d857b00d582d7cd6cea9ac740ea912b (diff) |
Merge branch '2022-08-11-verified-boot-for-embedded-initial-support'
To quote Simon:
This adds the concept of a VBE method to U-Boot, along with an
implementation of the 'VBE simple' method, basically a simple way of
updating firmware in MMC from userspace and monitoring it from U-Boot.
VBE simple is implemented in fwupd. U-Boot's role is to set up the
device tree with the required firmware-update properties and provide the
developer with information about the current VBE state. To that end this
series includes a new 'vbe' command that allows VBE methods to be listed
and examined.
As part of this work, support for doing FDT fixups via the event interface
is provided, along with the ability to write to the device tree via the
ofnode interface.
Another (significant) change is that bootmeths now have a 'global' flag,
to allow the implementation of EFI bootmgr (and VBE) to be cleaned up.
The 'system' bootdev is no-longer needed and these bootmeths are scanned
first.
Further work is needed to pull everything together, but this is a step
along the way.
Diffstat (limited to 'boot/bootstd-uclass.c')
-rw-r--r-- | boot/bootstd-uclass.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/boot/bootstd-uclass.c b/boot/bootstd-uclass.c index 3c6c32ae604..565c22a36e7 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)) @@ -150,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; } |