diff options
| author | Tom Rini <trini@konsulko.com> | 2018-09-26 15:14:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-26 17:02:46 -0400 |
| commit | 0ae8dcfef7c890330c62bb34c724126ffc169bef (patch) | |
| tree | aeeaa9a83efad66ca4db0b4aca2ee5cf3478728e /common | |
| parent | d8d81d4a5d0e5aaef5a005a357d3b9ed2b7cc4b2 (diff) | |
| parent | eaac4fb296b1899369e49d941f2c0d346c7f5c7a (diff) | |
| download | u-boot-0ae8dcfef7c890330c62bb34c724126ffc169bef.zip u-boot-0ae8dcfef7c890330c62bb34c724126ffc169bef.tar.gz u-boot-0ae8dcfef7c890330c62bb34c724126ffc169bef.tar.bz2 | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2018-09-26
A lot of goodness in this release. We're *very* close to running the
UEFI Shell and SCT natively. The only missing piece are HII protocols.
- FAT write support (needed for SCT)
- improved FAT directory support (needed for SCT)
- RTC support with QEMU -M virt
- Sandbox support (run UEFI binaries in Linux - yay)
- Proper UTF-16 support
- EFI_UNICODE_COLLATION_PROTOCOL support (for UEFI Shell)
- EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL support (for UEFI Shell)
- Fix window size determination
- Fix Tegra by explicitly unmapping RAM
- Clean up handle entanglement
- Lots of generic code cleanup
[trini: Fixup merge conflict in include/configs/qemu-arm.h]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/bootm.c | 2 | ||||
| -rw-r--r-- | common/image-fdt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/bootm.c b/common/bootm.c index e517d9f..8bf84eb 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -262,7 +262,7 @@ int bootm_find_images(int flag, int argc, char * const argv[]) puts("Could not find a valid device tree\n"); return 1; } - set_working_fdt_addr((ulong)images.ft_addr); + set_working_fdt_addr(map_to_sysmem(images.ft_addr)); #endif #if IMAGE_ENABLE_FIT diff --git a/common/image-fdt.c b/common/image-fdt.c index 9b41f16..95748f0 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -193,7 +193,7 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size) *of_flat_tree = of_start; *of_size = of_len; - set_working_fdt_addr((ulong)*of_flat_tree); + set_working_fdt_addr(map_to_sysmem(*of_flat_tree)); return 0; error: |