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/nvidia | |
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/nvidia')
-rw-r--r-- | sys/arm/nvidia/tegra124/tegra124_machdep.c | 19 | ||||
-rw-r--r-- | sys/arm/nvidia/tegra_efuse.c | 2 |
2 files changed, 1 insertions, 20 deletions
diff --git a/sys/arm/nvidia/tegra124/tegra124_machdep.c b/sys/arm/nvidia/tegra124/tegra124_machdep.c index 1233a42..d1e3889 100644 --- a/sys/arm/nvidia/tegra124/tegra124_machdep.c +++ b/sys/arm/nvidia/tegra124/tegra124_machdep.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#define _ARM32_BUS_DMA_PRIVATE #include "opt_platform.h" #include <sys/cdefs.h> @@ -62,24 +61,6 @@ __FBSDID("$FreeBSD$"); PMC_SCRATCH0_MODE_BOOTLOADER | \ PMC_SCRATCH0_MODE_RCM) -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - static vm_offset_t tegra124_lastaddr(platform_t plat) { diff --git a/sys/arm/nvidia/tegra_efuse.c b/sys/arm/nvidia/tegra_efuse.c index 34e0da0..889c06f 100644 --- a/sys/arm/nvidia/tegra_efuse.c +++ b/sys/arm/nvidia/tegra_efuse.c @@ -237,7 +237,7 @@ tegra_fuse_read_4(int addr) { static void -tegra_efuse_dump_sku() +tegra_efuse_dump_sku(void) { printf(" TEGRA SKU Info:\n"); printf(" chip_id: %u\n", tegra_sku_info.chip_id); |