diff options
| author | ian <ian@FreeBSD.org> | 2017-03-01 19:55:04 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2017-03-01 19:55:04 +0000 |
| commit | b6db1fb93d0aefdf2d82e9b20ca36094d5a3cb32 (patch) | |
| tree | 74ac95ca667cdb4a171c9b715afd910264fb413d /sys/arm/qemu | |
| parent | fc497a4640d662955a6d75b5e5ca52703fbb525a (diff) | |
| download | FreeBSD-src-b6db1fb93d0aefdf2d82e9b20ca36094d5a3cb32.zip FreeBSD-src-b6db1fb93d0aefdf2d82e9b20ca36094d5a3cb32.tar.gz | |
MFC r306262, r306267, r310021: (needed to avoid conflicts on later merges)
Remove bus_dma_get_range and bus_dma_get_range_nb on armv6. We only need
this on a few earlier arm SoCs.
Restrict where we need to define fdt_fixup_table to just PowerPC and
Marvell.
Add the missing void to function signatures in much of the arm code.
Diffstat (limited to 'sys/arm/qemu')
| -rw-r--r-- | sys/arm/qemu/virt_common.c | 4 | ||||
| -rw-r--r-- | sys/arm/qemu/virt_machdep.c | 15 |
2 files changed, 0 insertions, 19 deletions
diff --git a/sys/arm/qemu/virt_common.c b/sys/arm/qemu/virt_common.c index 03cba30..cda02e5 100644 --- a/sys/arm/qemu/virt_common.c +++ b/sys/arm/qemu/virt_common.c @@ -37,10 +37,6 @@ __FBSDID("$FreeBSD$"); #include <machine/intr.h> -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG fdt_pic_decode_t fdt_pic_table[] = { &gic_decode_fdt, diff --git a/sys/arm/qemu/virt_machdep.c b/sys/arm/qemu/virt_machdep.c index d15b97c..8509ca6 100644 --- a/sys/arm/qemu/virt_machdep.c +++ b/sys/arm/qemu/virt_machdep.c @@ -30,7 +30,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> #include <sys/systm.h> #include <sys/devmap.h> @@ -45,20 +44,6 @@ __FBSDID("$FreeBSD$"); #include "platform_if.h" -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - void cpu_reset(void) { |
