diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-31 10:05:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-31 10:05:57 -0400 |
| commit | 1104dde6e89f3d3ab07284e7c871cc33037f1198 (patch) | |
| tree | c7ce7355e30a785007038924b68e7f8870b574fb /include | |
| parent | d1048a60cf874deb6cabc44f6abb4b8d71305e09 (diff) | |
| parent | 67357553ad59eb9b4f412412252e02868ceb16dc (diff) | |
| download | u-boot-1104dde6e89f3d3ab07284e7c871cc33037f1198.tar.gz u-boot-1104dde6e89f3d3ab07284e7c871cc33037f1198.tar.xz u-boot-1104dde6e89f3d3ab07284e7c871cc33037f1198.zip | |
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 'include')
| -rw-r--r-- | include/configs/vexpress_common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 7f215a6707..e73658a9e6 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -207,7 +207,8 @@ "devtmpfs.mount=0 vmalloc=256M\0" \ "bootflash=run flashargs; " \ "cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \ - "bootm ${kernel_addr} ${ramdisk_addr_r}\0" + "bootm ${kernel_addr} ${ramdisk_addr_r}\0" \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" /* FLASH and environment organization */ #define PHYS_FLASH_SIZE 0x04000000 /* 64MB */ |