Move more bus_space_* files to be built by files.arm. This leaves the

definition in a file.* file under sys/arm/arm in the few cases we need it
for non-fdt platforms.

Sponsored by:	ABT Systems Ltd

24 files changed, 2 insertions, 54 deletions

diff --git a/sys/arm/allwinner/files.allwinner b/sys/arm/allwinner/files.allwinner
index 0a259dc..ea59bc2 100644
--- a/sys/arm/allwinner/files.allwinner
+++ b/sys/arm/allwinner/files.allwinner
@@ -1,9 +1,6 @@
 # $FreeBSD$
 kern/kern_clocksource.c			standard
 
-arm/arm/bus_space_base.c		standard
-arm/arm/bus_space_generic.c		standard
-
 arm/allwinner/a10_ahci.c		optional	ahci
 arm/allwinner/a10_clk.c			standard
 arm/allwinner/a10_common.c		standard
diff --git a/sys/arm/altera/socfpga/files.socfpga b/sys/arm/altera/socfpga/files.socfpga
index 955cbc5..4089084 100644
--- a/sys/arm/altera/socfpga/files.socfpga
+++ b/sys/arm/altera/socfpga/files.socfpga
@@ -2,9 +2,6 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space_generic.c			standard
-
-arm/arm/bus_space_base.c			standard
 arm/arm/mpcore_timer.c				standard
 
 arm/altera/socfpga/socfpga_common.c		standard
diff --git a/sys/arm/amlogic/aml8726/files.aml8726 b/sys/arm/amlogic/aml8726/files.aml8726
index ebb42f7..5b2df66 100644
--- a/sys/arm/amlogic/aml8726/files.aml8726
+++ b/sys/arm/amlogic/aml8726/files.aml8726
@@ -2,9 +2,6 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space_base.c			standard
-arm/arm/bus_space_generic.c			standard
-
 arm/amlogic/aml8726/aml8726_l2cache.c		standard
 
 arm/amlogic/aml8726/aml8726_machdep.c		standard
diff --git a/sys/arm/annapurna/alpine/files.alpine b/sys/arm/annapurna/alpine/files.alpine
index 729bdc9..e1bba4b 100644
--- a/sys/arm/annapurna/alpine/files.alpine
+++ b/sys/arm/annapurna/alpine/files.alpine
@@ -2,9 +2,6 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space_base.c			standard
-arm/arm/bus_space_generic.c			standard
-
 arm/versatile/sp804.c				standard
 arm/versatile/versatile_timer.c			standard
 dev/uart/uart_dev_ns8250.c			optional	uart
diff --git a/sys/arm/at91/files.at91 b/sys/arm/at91/files.at91
index 7f4cb89..84056a4 100644
--- a/sys/arm/at91/files.at91
+++ b/sys/arm/at91/files.at91
@@ -1,5 +1,4 @@
 # $FreeBSD$
-arm/arm/bus_space_generic.c	standard
 arm/at91/at91_machdep.c		standard
 arm/at91/at91_aic.c		standard
 arm/at91/at91.c			standard
diff --git a/sys/arm/broadcom/bcm2835/files.bcm283x b/sys/arm/broadcom/bcm2835/files.bcm283x
index 7a834e8..bcd2bea 100644
--- a/sys/arm/broadcom/bcm2835/files.bcm283x
+++ b/sys/arm/broadcom/bcm2835/files.bcm283x
@@ -16,9 +16,6 @@ arm/broadcom/bcm2835/bcm2835_vcio.c		standard
 arm/broadcom/bcm2835/bcm2835_wdog.c		standard
 arm/broadcom/bcm2835/bcm283x_dwc_fdt.c		optional dwcotg fdt
 
-arm/arm/bus_space_base.c			standard
-arm/arm/bus_space_generic.c                     standard
-
 kern/kern_clocksource.c                         standard
 
 dev/mbox/mbox_if.m				standard
diff --git a/sys/arm/cavium/cns11xx/files.econa b/sys/arm/cavium/cns11xx/files.econa
index 13e1bf6..4158229 100644
--- a/sys/arm/cavium/cns11xx/files.econa
+++ b/sys/arm/cavium/cns11xx/files.econa
@@ -6,7 +6,6 @@ arm/cavium/cns11xx/uart_bus_ec.c		optional	uart
 arm/cavium/cns11xx/uart_cpu_ec.c		optional	uart
 dev/uart/uart_dev_ns8250.c	optional	uart
 arm/arm/bus_space_base.c		standard
-arm/arm/bus_space_generic.c		standard
 arm/cavium/cns11xx/ehci_ebus.c	optional	ehci
 arm/cavium/cns11xx/ohci_ec.c	optional	ohci
 arm/cavium/cns11xx/if_ece.c		standard
diff --git a/sys/arm/freescale/imx/files.imx5 b/sys/arm/freescale/imx/files.imx5
index 6c37bf8..aaea851 100644
--- a/sys/arm/freescale/imx/files.imx5
+++ b/sys/arm/freescale/imx/files.imx5
@@ -1,5 +1,4 @@
 # $FreeBSD$
-arm/arm/bus_space_generic.c		standard
 kern/kern_clocksource.c			standard
 
 # Init
@@ -7,7 +6,6 @@ arm/freescale/imx/imx_common.c		standard
 arm/freescale/imx/imx_machdep.c		standard
 arm/freescale/imx/imx51_machdep.c	optional	soc_imx51
 arm/freescale/imx/imx53_machdep.c	optional	soc_imx53
-arm/arm/bus_space_base.c		standard
 
 # Special serial console for debuging early boot code
 #arm/freescale/imx/console.c		standard
diff --git a/sys/arm/freescale/imx/files.imx6 b/sys/arm/freescale/imx/files.imx6
index 92d3299..b5271d5 100644
--- a/sys/arm/freescale/imx/files.imx6
+++ b/sys/arm/freescale/imx/files.imx6
@@ -3,13 +3,11 @@
 #
 # Standard ARM support.
 #
-arm/arm/bus_space_generic.c		standard
 kern/kern_clocksource.c			standard
 
 #
 # Standard imx6 devices and support.
 #
-arm/arm/bus_space_base.c		standard
 arm/arm/mpcore_timer.c			standard
 arm/freescale/fsl_ocotp.c		standard
 arm/freescale/imx/imx6_anatop.c		standard
diff --git a/sys/arm/freescale/vybrid/files.vybrid b/sys/arm/freescale/vybrid/files.vybrid
index 27799f6..20c1699 100644
--- a/sys/arm/freescale/vybrid/files.vybrid
+++ b/sys/arm/freescale/vybrid/files.vybrid
@@ -2,9 +2,6 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space_generic.c			standard
-
-arm/arm/bus_space_base.c			standard
 arm/arm/mpcore_timer.c				standard
 
 arm/freescale/vybrid/vf_machdep.c		standard
diff --git a/sys/arm/lpc/files.lpc b/sys/arm/lpc/files.lpc
index 01715d3..7c41016 100644
--- a/sys/arm/lpc/files.lpc
+++ b/sys/arm/lpc/files.lpc
@@ -1,6 +1,4 @@
 # $FreeBSD$
-arm/arm/bus_space_base.c		standard
-arm/arm/bus_space_generic.c		standard
 arm/lpc/lpc_machdep.c			standard
 arm/lpc/lpc_pwr.c			standard
 arm/lpc/lpc_intc.c			standard
diff --git a/sys/arm/mv/files.mv b/sys/arm/mv/files.mv
index fd5c5f1..78b5548 100644
--- a/sys/arm/mv/files.mv
+++ b/sys/arm/mv/files.mv
@@ -12,9 +12,6 @@
 # - JTAG/ICE
 # - Vector Floating Point (VFP) unit
 #
-arm/arm/bus_space_base.c	standard
-arm/arm/bus_space_generic.c	standard
-
 arm/mv/gpio.c			standard
 arm/mv/mv_common.c		standard
 arm/mv/mv_localbus.c		standard
diff --git a/sys/arm/qemu/files.qemu b/sys/arm/qemu/files.qemu
index 48d7e4a..0ba925e 100644
--- a/sys/arm/qemu/files.qemu
+++ b/sys/arm/qemu/files.qemu
@@ -3,8 +3,6 @@
 #
 # Standard ARM support.
 #
-arm/arm/bus_space_base.c		standard
-arm/arm/bus_space_generic.c		standard
 kern/kern_clocksource.c			standard
 
 #
diff --git a/sys/arm/rockchip/files.rk30xx b/sys/arm/rockchip/files.rk30xx
index 276a993..721eb95 100644
--- a/sys/arm/rockchip/files.rk30xx
+++ b/sys/arm/rockchip/files.rk30xx
@@ -1,11 +1,8 @@
 # $FreeBSD$
 kern/kern_clocksource.c			standard
 
-arm/arm/bus_space_generic.c		standard
-
 arm/arm/mpcore_timer.c			standard
 
-arm/arm/bus_space_base.c		standard
 arm/rockchip/rk30xx_common.c		standard
 arm/rockchip/rk30xx_machdep.c		standard
 arm/rockchip/rk30xx_pmu.c		standard
diff --git a/sys/arm/samsung/exynos/files.exynos5 b/sys/arm/samsung/exynos/files.exynos5
index b8ea8a6..589cc77 100644
--- a/sys/arm/samsung/exynos/files.exynos5
+++ b/sys/arm/samsung/exynos/files.exynos5
@@ -2,9 +2,6 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space_generic.c			standard
-
-arm/arm/bus_space_base.c			standard
 arm/arm/generic_timer.c				standard
 
 arm/samsung/exynos/exynos5_mct.c		standard
diff --git a/sys/arm/ti/files.ti b/sys/arm/ti/files.ti
index d2a4ee4..d4daab1 100644
--- a/sys/arm/ti/files.ti
+++ b/sys/arm/ti/files.ti
@@ -2,9 +2,6 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space_base.c			standard
-arm/arm/bus_space_generic.c			standard
-
 arm/ti/ti_common.c				standard
 arm/ti/ti_cpuid.c				standard
 arm/ti/ti_hwmods.c				standard
diff --git a/sys/arm/versatile/files.versatile b/sys/arm/versatile/files.versatile
index 99562a4..c7dabb7 100644
--- a/sys/arm/versatile/files.versatile
+++ b/sys/arm/versatile/files.versatile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 
-arm/arm/bus_space_base.c 			standard
-arm/arm/bus_space_generic.c                     standard
-
 arm/versatile/pl050.c				optional sc
 arm/versatile/sp804.c				standard
 arm/versatile/versatile_machdep.c		standard
diff --git a/sys/arm/xilinx/files.zynq7 b/sys/arm/xilinx/files.zynq7
index 8643a9e..008e0f7 100644
--- a/sys/arm/xilinx/files.zynq7
+++ b/sys/arm/xilinx/files.zynq7
@@ -5,9 +5,6 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space_base.c			standard
-arm/arm/bus_space_generic.c			standard
-
 arm/arm/mpcore_timer.c				standard
 
 arm/xilinx/zy7_machdep.c			standard
diff --git a/sys/arm/xscale/i80321/files.i80219 b/sys/arm/xscale/i80321/files.i80219
index 1162161..306376b 100644
--- a/sys/arm/xscale/i80321/files.i80219
+++ b/sys/arm/xscale/i80321/files.i80219
@@ -2,8 +2,6 @@
 #
 # IOP Specific
 # 
-arm/arm/bus_space_base.c		standard
-arm/arm/bus_space_generic.c		standard
 arm/xscale/i80321/i80321.c		standard
 arm/xscale/i80321/i80321_dma.c		optional	dma
 arm/xscale/i80321/i80321_mcu.c		standard
diff --git a/sys/arm/xscale/i80321/files.i80321 b/sys/arm/xscale/i80321/files.i80321
index 4f41cec..bd318af 100644
--- a/sys/arm/xscale/i80321/files.i80321
+++ b/sys/arm/xscale/i80321/files.i80321
@@ -1,6 +1,4 @@
 #$FreeBSD$
-arm/arm/bus_space_base.c		standard
-arm/arm/bus_space_generic.c		standard
 arm/xscale/i80321/i80321.c		standard
 arm/xscale/i80321/i80321_aau.c		optional	aau
 arm/xscale/i80321/i80321_dma.c		optional	dma
diff --git a/sys/arm/xscale/i8134x/files.i81342 b/sys/arm/xscale/i8134x/files.i81342
index 31c78d2..ed93e6b 100644
--- a/sys/arm/xscale/i8134x/files.i81342
+++ b/sys/arm/xscale/i8134x/files.i81342
@@ -1,6 +1,5 @@
 # $FreeBSD$
 arm/arm/bus_space_base.c		standard
-arm/arm/bus_space_generic.c		standard
 arm/xscale/i80321/i80321_timer.c	standard
 arm/xscale/i80321/i80321_wdog.c		optional	iopwdog
 arm/xscale/i8134x/i81342.c		standard
diff --git a/sys/arm/xscale/ixp425/files.ixp425 b/sys/arm/xscale/ixp425/files.ixp425
index 9a34b23..4da51f0 100644
--- a/sys/arm/xscale/ixp425/files.ixp425
+++ b/sys/arm/xscale/ixp425/files.ixp425
@@ -1,5 +1,4 @@
 #$FreeBSD$
-arm/arm/bus_space_generic.c		standard
 arm/xscale/ixp425/ixp425.c		standard
 arm/xscale/ixp425/ixp425_mem.c		standard
 arm/xscale/ixp425/ixp425_space.c	standard
diff --git a/sys/arm/xscale/pxa/files.pxa b/sys/arm/xscale/pxa/files.pxa
index a9a4fcf..6528770 100644
--- a/sys/arm/xscale/pxa/files.pxa
+++ b/sys/arm/xscale/pxa/files.pxa
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-arm/arm/bus_space_generic.c		standard
-
 arm/xscale/pxa/pxa_gpio.c		standard
 arm/xscale/pxa/pxa_icu.c		standard
 arm/xscale/pxa/pxa_machdep.c		standard
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 66c8daf..de23a6e 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -4,6 +4,8 @@ arm/arm/bcopy_page.S		standard
 arm/arm/bcopyinout.S		standard
 arm/arm/blockio.S		standard
 arm/arm/bus_space_asm_generic.S	standard
+arm/arm/bus_space_base.c	optional	fdt
+arm/arm/bus_space_generic.c	standard
 arm/arm/busdma_machdep.c 	optional	!armv6
 arm/arm/busdma_machdep-v6.c 	optional	armv6
 arm/arm/copystr.S		standard