diff options
author | Tom Rini <trini@konsulko.com> | 2020-03-31 17:05:57 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-03-31 17:05:57 +0300 |
commit | 1104dde6e89f3d3ab07284e7c871cc33037f1198 (patch) | |
tree | c7ce7355e30a785007038924b68e7f8870b574fb /configs | |
parent | d1048a60cf874deb6cabc44f6abb4b8d71305e09 (diff) | |
parent | 67357553ad59eb9b4f412412252e02868ceb16dc (diff) | |
download | u-boot-1104dde6e89f3d3ab07284e7c871cc33037f1198.tar.xz |
Merge tag 'efi-2020-04-rc5' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-04-rc5
This series fixes:
* UEFI Python tests CONFIG_OF_CONTROL=y.
* int to pointer cast warning for cmd/efidebug.c
* memory reservation even if fdt node is disabled
Now that the Python test is fixed reintroduce the reverted patch for
vexpress_ca9x4 to enable EFI_LOADER and define the dtb file name.
Diffstat (limited to 'configs')
-rw-r--r-- | configs/vexpress_ca9x4_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig index 2119df6b10..6bd1f253b6 100644 --- a/configs/vexpress_ca9x4_defconfig +++ b/configs/vexpress_ca9x4_defconfig @@ -34,4 +34,4 @@ CONFIG_SMC911X_32_BIT=y CONFIG_BAUDRATE=38400 CONFIG_CONS_INDEX=0 CONFIG_OF_LIBFDT=y -# CONFIG_EFI_LOADER is not set +CONFIG_DEFAULT_FDT_FILE="vexpress-v2p-ca9.dtb" |