diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-03 17:52:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-03 17:52:40 -0500 |
| commit | f388e3bed7318efe97058b673801dda6f563d319 (patch) | |
| tree | ed391f6b8cfad1bc53dabeb7239ffcc716a8ca4e /lib/fdtdec.c | |
| parent | ec0d0d8742df12a4c0d3e8382b77c0672cd4aab6 (diff) | |
| parent | 1a82b3413cb577cd52cf8a1dc22dd306e4ce0772 (diff) | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2018-12-03
This release is fully packed with lots of glorious improvements in UEFI
land again!
- Make PE images more standards compliant
- Improve sandbox support
- Improve correctness
- Fix RISC-V execution on virt model
- Honor board defined top of ram (fixes a few boards)
- Imply DM USB access when distro boot is available
- Code cleanups
Diffstat (limited to 'lib/fdtdec.c')
| -rw-r--r-- | lib/fdtdec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index d28f2cbb1c..cbdc077825 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -11,6 +11,7 @@ #include <errno.h> #include <fdtdec.h> #include <fdt_support.h> +#include <mapmem.h> #include <linux/libfdt.h> #include <serial.h> #include <asm/sections.h> @@ -1253,8 +1254,9 @@ int fdtdec_setup(void) # if CONFIG_IS_ENABLED(OF_PRIOR_STAGE) gd->fdt_blob = (void *)prior_stage_fdt_address; # else - gd->fdt_blob = (void *)env_get_ulong("fdtcontroladdr", 16, - (uintptr_t)gd->fdt_blob); + gd->fdt_blob = map_sysmem + (env_get_ulong("fdtcontroladdr", 16, + (unsigned long)map_to_sysmem(gd->fdt_blob)), 0); # endif # endif |