diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-19 17:25:26 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-19 17:25:26 -0500 |
| commit | 9770f92d022211dc02fb496a7642fde1a96a2292 (patch) | |
| tree | ead0f925ee73ebdfd266e5d35fcf06434e0030db | |
| parent | 42a2de54d066c256925b85f6885179c9999811e4 (diff) | |
| parent | 0e228853b520611a0ee6fe2b9bd7a0bc3f8c30fc (diff) | |
| download | u-boot-9770f92d022211dc02fb496a7642fde1a96a2292.tar.gz | |
Merge tag 'efi-2020-04-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-04-rc3
* Update the Kconfig description of CONFIG_EFI_RNG_PROTOCOL
* Fix a function comment resolving a warning in 'make htmldocs'
| -rw-r--r-- | cmd/bootefi.c | 10 | ||||
| -rw-r--r-- | lib/efi_loader/Kconfig | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index d347bd5ec0..24fc42ae89 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -203,15 +203,15 @@ static void *get_config_table(const efi_guid_t *guid) /** * efi_install_fdt() - install device tree * - * If fdt_addr is available, the device tree located at that memory address will - * will be installed as configuration table, otherwise the device tree located - * at the address indicated by environment variable fdt_addr or as fallback - * fdtcontroladdr will be used. + * If fdt is not EFI_FDT_USE_INTERNAL, the device tree located at that memory + * address will will be installed as configuration table, otherwise the device + * tree located at the address indicated by environment variable fdt_addr or as + * fallback fdtcontroladdr will be used. * * On architectures using ACPI tables device trees shall not be installed as * configuration table. * - * @fdt_addr: address of device tree or EFI_FDT_USE_INTERNAL to use the + * @fdt: address of device tree or EFI_FDT_USE_INTERNAL to use the * the hardware device tree as indicated by environment variable * fdt_addr or as fallback the internal device tree as indicated by * the environment variable fdtcontroladdr diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index a7afa3f29e..76f43eca95 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -127,7 +127,7 @@ config EFI_RNG_PROTOCOL bool "EFI_RNG_PROTOCOL support" depends on DM_RNG help - "Support for EFI_RNG_PROTOCOL implementation. Uses the rng - device on the platform" + Provide a EFI_RNG_PROTOCOL implementation using the hardware random + number generator of the platform. endif |