diff options
| author | Tom Rini <trini@konsulko.com> | 2022-07-27 06:59:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-07-27 06:59:55 -0400 |
| commit | 7277c4bddceb6b8a59ba47b8b111ab070d86919f (patch) | |
| tree | 0bd1db6551763d178d25e80a350be458150c9e8e /lib | |
| parent | 81e712a91729950fbd8fb38a6f729cb9847b0adb (diff) | |
| parent | dce4322c0e1940e11ef9ff086890b8c474707317 (diff) | |
Merge tag 'dm-pull-26jul22' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm.git
minor dm- and fdt-related fixes
start of test for fdt command
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/addr_map.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/addr_map.c b/lib/addr_map.c index fb2ef400078..9b3e0a544e4 100644 --- a/lib/addr_map.c +++ b/lib/addr_map.c @@ -5,6 +5,7 @@ #include <common.h> #include <addr_map.h> +#include <mapmem.h> struct addrmap address_map[CONFIG_SYS_NUM_ADDR_MAP]; @@ -18,7 +19,7 @@ phys_addr_t addrmap_virt_to_phys(void * vaddr) if (address_map[i].size == 0) continue; - addr = (u64)((u32)vaddr); + addr = map_to_sysmem(vaddr); base = (u64)(address_map[i].vaddr); upper = (u64)(address_map[i].size) + base - 1; @@ -48,7 +49,7 @@ void *addrmap_phys_to_virt(phys_addr_t paddr) offset = address_map[i].paddr - address_map[i].vaddr; - return (void *)(unsigned long)(paddr - offset); + return map_sysmem(paddr - offset, 0); } } |