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 /common | |
| 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 'common')
| -rw-r--r-- | common/board_r.c | 3 | ||||
| -rw-r--r-- | common/fdt_support.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/common/board_r.c b/common/board_r.c index 0c2129b8ce..21d3b3c64c 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -453,7 +453,8 @@ static int initr_env(void) else set_default_env(NULL, 0); #ifdef CONFIG_OF_CONTROL - env_set_addr("fdtcontroladdr", gd->fdt_blob); + env_set_hex("fdtcontroladdr", + (unsigned long)map_to_sysmem(gd->fdt_blob)); #endif /* Initialize from environment */ diff --git a/common/fdt_support.c b/common/fdt_support.c index e6daa67990..3440e42a25 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <mapmem.h> #include <stdio_dev.h> #include <linux/ctype.h> #include <linux/types.h> @@ -633,7 +634,7 @@ int fdt_shrink_to_minimum(void *blob, uint extrasize) fdt_set_totalsize(blob, actualsize); /* Add the new reservation */ - ret = fdt_add_mem_rsv(blob, (uintptr_t)blob, actualsize); + ret = fdt_add_mem_rsv(blob, map_to_sysmem(blob), actualsize); if (ret < 0) return ret; |