Commit 9770f92d authored by Tom Rini's avatar Tom Rini
Browse files

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'
parents 42a2de54 0e228853
......@@ -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
......
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment