Message ID | 1613663886-83811-13-git-send-email-bmeng.cn@gmail.com |
---|---|
State | Superseded |
Delegated to: | Priyanka Jain |
Headers | show |
Series | ppc: qemu: Convert qemu-ppce500 to driver model and enable additional driver support | expand |
>-----Original Message----- >From: Bin Meng <bmeng.cn@gmail.com> >Sent: Thursday, February 18, 2021 9:28 PM >To: Simon Glass <sjg@chromium.org>; Alexander Graf <agraf@csgraf.de>; >Priyanka Jain <priyanka.jain@nxp.com> >Cc: U-Boot Mailing List <u-boot@lists.denx.de>; Tom Rini ><trini@konsulko.com> >Subject: [PATCH v2 12/38] lib: addr_map: Move address_map[] type to the >header file > >At present address_map[] is static and its type is unknown to external >modules. In preparation to create a command to list its contents, this patch >moves its type definition and declaration to the header file. > >Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >Reviewed-by: Simon Glass <sjg@chromium.org> >--- > >(no changes since v1) > > include/addr_map.h | 8 ++++++++ > lib/addr_map.c | 6 +----- > 2 files changed, 9 insertions(+), 5 deletions(-) > >diff --git a/include/addr_map.h b/include/addr_map.h index >85e737d..55d3a6a 100644 >--- a/include/addr_map.h >+++ b/include/addr_map.h >@@ -8,6 +8,14 @@ > > #include <asm/types.h> > >+struct addrmap { >+ phys_addr_t paddr; >+ phys_size_t size; >+ unsigned long vaddr; >+}; >+ >+extern struct addrmap address_map[CONFIG_SYS_NUM_ADDR_MAP]; >+ > phys_addr_t addrmap_virt_to_phys(void *vaddr); void >*addrmap_phys_to_virt(phys_addr_t paddr); void >addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr, diff --git >a/lib/addr_map.c b/lib/addr_map.c index 09771f3..fb2ef40 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) { >-- >2.7.4 Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
diff --git a/include/addr_map.h b/include/addr_map.h index 85e737d..55d3a6a 100644 --- a/include/addr_map.h +++ b/include/addr_map.h @@ -8,6 +8,14 @@ #include <asm/types.h> +struct addrmap { + phys_addr_t paddr; + phys_size_t size; + unsigned long vaddr; +}; + +extern struct addrmap address_map[CONFIG_SYS_NUM_ADDR_MAP]; + phys_addr_t addrmap_virt_to_phys(void *vaddr); void *addrmap_phys_to_virt(phys_addr_t paddr); void addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr, diff --git a/lib/addr_map.c b/lib/addr_map.c index 09771f3..fb2ef40 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) {