diff options
author | Tom Rini <trini@konsulko.com> | 2021-03-06 07:25:04 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-03-06 07:25:04 -0500 |
commit | e4dba4ba6f61e8128be0b4200ca2d8cebf62180b (patch) | |
tree | 9f2877b1278093a579247756fdfd7fbe1055f63c /lib | |
parent | 6a026e5649f00c0b157a935279dfd625889db675 (diff) | |
parent | b75ca06836567a467b8b5a9ee8ce0a8efde45e08 (diff) |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Convert qemu-ppce500 to driver model and enable additional driver
support
- bug fixes/updates in net-dsa driver, vid driver, move configs to kconfig
- Update Maintainers of some powerpc, layerscape platforms
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Kconfig | 2 | ||||
-rw-r--r-- | lib/addr_map.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 7f4c30ec0d..7288340614 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -6,6 +6,8 @@ config ADDR_MAP Enables helper code for implementing non-identity virtual-physical memory mappings for 32bit CPUs. + This library only works in the post-relocation phase. + config SYS_NUM_ADDR_MAP int "Size of the address-map table" depends on ADDR_MAP diff --git a/lib/addr_map.c b/lib/addr_map.c index 09771f3a5a..fb2ef40007 100644 --- a/lib/addr_map.c +++ b/lib/addr_map.c @@ -6,11 +6,7 @@ #include <common.h> #include <addr_map.h> -static struct { - phys_addr_t paddr; - phys_size_t size; - unsigned long vaddr; -} address_map[CONFIG_SYS_NUM_ADDR_MAP]; +struct addrmap address_map[CONFIG_SYS_NUM_ADDR_MAP]; phys_addr_t addrmap_virt_to_phys(void * vaddr) { |