diff options
| author | Tom Rini <[email protected]> | 2021-08-02 08:54:23 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-08-02 08:54:23 -0400 |
| commit | 73994c452fc5a960114360a651201ac48b135e81 (patch) | |
| tree | 6a70a64de049b6fe1876b2ddff76a52e5637aa0a /lib | |
| parent | 99bb5f248ade371ee4713e0ef51401708ecbb13c (diff) | |
| parent | 78e6b871fdcf4bb86c6d7292a0e5d4a98e1435b6 (diff) | |
Merge tag 'efi-2021-10-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2021-10-rc2
Documentation:
* handle 'make htmldocs' warnings as errors
* add missing board/ti/index.rst
Bug fixes:
* avoid buffer overrun in TrueType console
* lib: disable CONFIG_SPL_HEXDUMP by default
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig | 3 | ||||
| -rw-r--r-- | lib/efi_loader/Makefile | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index fdcf7ea4050..7b445d01641 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -566,8 +566,7 @@ config HEXDUMP config SPL_HEXDUMP bool "Enable hexdump in SPL" - depends on HEXDUMP - default y + depends on SPL && HEXDUMP help This enables functions for printing dumps of binary data in SPL. diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index 9b369430e25..08469d9cd95 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -23,7 +23,7 @@ endif ifeq ($(CONFIG_EFI_CAPSULE_AUTHENTICATE),y) EFI_CAPSULE_KEY_PATH := $(subst $\",,$(CONFIG_EFI_CAPSULE_KEY_PATH)) ifeq ("$(wildcard $(EFI_CAPSULE_KEY_PATH))","") -$(error .esl cerificate not found. Configure your CONFIG_EFI_CAPSULE_KEY_PATH) +$(error .esl certificate not found. Configure your CONFIG_EFI_CAPSULE_KEY_PATH) endif endif |