diff options
author | br <br@FreeBSD.org> | 2016-04-26 11:53:37 +0000 |
---|---|---|
committer | br <br@FreeBSD.org> | 2016-04-26 11:53:37 +0000 |
commit | 778cc5a8110efa54481c3c539aab11ad44e1efad (patch) | |
tree | 97a3c2543ae513e2b876f0ecd1746036805b5285 /sys/arm/xscale | |
parent | 392b4907a4ffb8e699201d053a85e4a32b845a6a (diff) | |
download | FreeBSD-src-778cc5a8110efa54481c3c539aab11ad44e1efad.zip FreeBSD-src-778cc5a8110efa54481c3c539aab11ad44e1efad.tar.gz |
Move arm's devmap to some generic place, so it can be used
by other architectures.
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D6091
Sponsored by: DARPA, AFRL
Sponsored by: HEIF5
Diffstat (limited to 'sys/arm/xscale')
-rw-r--r-- | sys/arm/xscale/i8134x/crb_machdep.c | 6 | ||||
-rw-r--r-- | sys/arm/xscale/ixp425/avila_machdep.c | 10 | ||||
-rw-r--r-- | sys/arm/xscale/pxa/pxa_machdep.c | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sys/arm/xscale/i8134x/crb_machdep.c b/sys/arm/xscale/i8134x/crb_machdep.c index 3ee31b5..5268ca9 100644 --- a/sys/arm/xscale/i8134x/crb_machdep.c +++ b/sys/arm/xscale/i8134x/crb_machdep.c @@ -72,6 +72,7 @@ __FBSDID("$FreeBSD$"); #include <sys/exec.h> #include <sys/kdb.h> #include <sys/msgbuf.h> +#include <sys/devmap.h> #include <machine/reg.h> #include <machine/cpu.h> @@ -80,7 +81,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_map.h> -#include <machine/devmap.h> #include <machine/vmparam.h> #include <machine/pcb.h> #include <machine/undefined.h> @@ -120,7 +120,7 @@ struct pv_addr abtstack; struct pv_addr kernelstack; /* Static device mappings. */ -static const struct arm_devmap_entry iq81342_devmap[] = { +static const struct devmap_entry iq81342_devmap[] = { { IOP34X_VADDR, IOP34X_HWADDR, @@ -249,7 +249,7 @@ initarm(struct arm_boot_params *abp) /* Map the vector page. */ pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - arm_devmap_bootstrap(l1pagetable, iq81342_devmap); + devmap_bootstrap(l1pagetable, iq81342_devmap); /* * Give the XScale global cache clean code an appropriately * sized chunk of unmapped VA space starting at 0xff000000 diff --git a/sys/arm/xscale/ixp425/avila_machdep.c b/sys/arm/xscale/ixp425/avila_machdep.c index 272b1a6..46e4b10 100644 --- a/sys/arm/xscale/ixp425/avila_machdep.c +++ b/sys/arm/xscale/ixp425/avila_machdep.c @@ -72,6 +72,7 @@ __FBSDID("$FreeBSD$"); #include <sys/exec.h> #include <sys/kdb.h> #include <sys/msgbuf.h> +#include <sys/devmap.h> #include <machine/physmem.h> #include <machine/reg.h> #include <machine/cpu.h> @@ -81,7 +82,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_map.h> -#include <machine/devmap.h> #include <machine/vmparam.h> #include <machine/pcb.h> #include <machine/undefined.h> @@ -117,7 +117,7 @@ struct pv_addr kernelstack; struct pv_addr minidataclean; /* Static device mappings. */ -static const struct arm_devmap_entry ixp425_devmap[] = { +static const struct devmap_entry ixp425_devmap[] = { /* Physical/Virtual address for I/O space */ { IXP425_IO_VBASE, IXP425_IO_HWBASE, IXP425_IO_SIZE, }, @@ -144,7 +144,7 @@ static const struct arm_devmap_entry ixp425_devmap[] = { }; /* Static device mappings. */ -static const struct arm_devmap_entry ixp435_devmap[] = { +static const struct devmap_entry ixp435_devmap[] = { /* Physical/Virtual address for I/O space */ { IXP425_IO_VBASE, IXP425_IO_HWBASE, IXP425_IO_SIZE, }, @@ -326,9 +326,9 @@ initarm(struct arm_boot_params *abp) pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); if (cpu_is_ixp43x()) - arm_devmap_bootstrap(l1pagetable, ixp435_devmap); + devmap_bootstrap(l1pagetable, ixp435_devmap); else - arm_devmap_bootstrap(l1pagetable, ixp425_devmap); + devmap_bootstrap(l1pagetable, ixp425_devmap); /* * Give the XScale global cache clean code an appropriately * sized chunk of unmapped VA space starting at 0xff000000 diff --git a/sys/arm/xscale/pxa/pxa_machdep.c b/sys/arm/xscale/pxa/pxa_machdep.c index d80da1f..32cbcd8 100644 --- a/sys/arm/xscale/pxa/pxa_machdep.c +++ b/sys/arm/xscale/pxa/pxa_machdep.c @@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$"); #include <sys/exec.h> #include <sys/kdb.h> #include <sys/msgbuf.h> +#include <sys/devmap.h> #include <machine/reg.h> #include <machine/cpu.h> @@ -81,7 +82,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_map.h> -#include <machine/devmap.h> #include <machine/vmparam.h> #include <machine/pcb.h> #include <machine/undefined.h> @@ -120,7 +120,7 @@ static void pxa_probe_sdram(bus_space_tag_t, bus_space_handle_t, uint32_t *, uint32_t *); /* Static device mappings. */ -static const struct arm_devmap_entry pxa_devmap[] = { +static const struct devmap_entry pxa_devmap[] = { /* * Map the on-board devices up into the KVA region so we don't muck * up user-space. @@ -254,7 +254,7 @@ initarm(struct arm_boot_params *abp) /* Map the vector page. */ pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - arm_devmap_bootstrap(l1pagetable, pxa_devmap); + devmap_bootstrap(l1pagetable, pxa_devmap); /* * Give the XScale global cache clean code an appropriately |