Rename bus_space-v6.c to bus_space_base.c, because it's not v6-specific

and now some v5 Marvell systems are using it.  Only define fdt_bus_tag
if option FDT is defined.

15 files changed, 22 insertions, 18 deletions

diff --git a/sys/arm/allwinner/a20/files.a20 b/sys/arm/allwinner/a20/files.a20
index 1c02e90..04f2379 100644
--- a/sys/arm/allwinner/a20/files.a20
+++ b/sys/arm/allwinner/a20/files.a20
@@ -17,7 +17,7 @@ arm/allwinner/a10_ehci.c		optional	ehci
 arm/allwinner/if_emac.c			optional	emac
 arm/allwinner/a10_wdog.c		standard
 arm/allwinner/timer.c			standard
-arm/arm/bus_space-v6.c			standard
-arm/allwinner/a10_common.c			standard
+arm/arm/bus_space_base.c		standard
+arm/allwinner/a10_common.c		standard
 arm/allwinner/a10_machdep.c		standard
 arm/allwinner/a20/a20_mp.c		optional	smp
diff --git a/sys/arm/allwinner/files.a10 b/sys/arm/allwinner/files.a10
index c14ef2e..eb5154e 100644
--- a/sys/arm/allwinner/files.a10
+++ b/sys/arm/allwinner/files.a10
@@ -19,5 +19,5 @@ arm/allwinner/a20/a20_cpu_cfg.c 	standard
 arm/allwinner/aintc.c			standard
 arm/allwinner/if_emac.c			optional	emac
 arm/allwinner/timer.c			standard
-arm/arm/bus_space-v6.c			standard
-#arm/allwinner/console.c			standard
+arm/arm/bus_space_base.c		standard
+#arm/allwinner/console.c		standard
diff --git a/sys/arm/altera/socfpga/files.socfpga b/sys/arm/altera/socfpga/files.socfpga
index 652ab98..22d7c28 100644
--- a/sys/arm/altera/socfpga/files.socfpga
+++ b/sys/arm/altera/socfpga/files.socfpga
@@ -9,7 +9,7 @@ arm/arm/cpufunc_asm_arm10.S			standard
 arm/arm/cpufunc_asm_arm11.S			standard
 arm/arm/cpufunc_asm_armv7.S			standard
 
-arm/arm/bus_space-v6.c				standard
+arm/arm/bus_space_base.c			standard
 arm/arm/gic.c					standard
 arm/arm/mpcore_timer.c				standard
 
diff --git a/sys/arm/arm/bus_space-v6.c b/sys/arm/arm/bus_space_base.c
index 4997c02..8ddfcb0 100644
--- a/sys/arm/arm/bus_space-v6.c
+++ b/sys/arm/arm/bus_space_base.c
@@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <machine/bus.h>
 
+#include "opt_platform.h"
+
 /* Prototypes for all the bus_space structure functions */
 bs_protos(generic);
 
@@ -43,7 +45,7 @@ bs_protos(generic);
  * The bus space tag.  This is constant for all instances, so
  * we never have to explicitly "create" it.
  */
-static struct bus_space _base_tag = {
+static struct bus_space arm_base_tag = {
 	/* privdata is whatever the implementer wants; unused in base tag */
 	.bs_privdata	= NULL,
 
@@ -150,4 +152,6 @@ static struct bus_space _base_tag = {
 	.bs_wr_8_s	= BS_UNIMPLEMENTED,
 };
 
-bus_space_tag_t fdtbus_bs_tag = &_base_tag;
+#ifdef FDT
+bus_space_tag_t fdtbus_bs_tag = &arm_base_tag;
+#endif
diff --git a/sys/arm/broadcom/bcm2835/files.bcm2835 b/sys/arm/broadcom/bcm2835/files.bcm2835
index 11158cb..53fd12f 100644
--- a/sys/arm/broadcom/bcm2835/files.bcm2835
+++ b/sys/arm/broadcom/bcm2835/files.bcm2835
@@ -15,7 +15,7 @@ arm/broadcom/bcm2835/bcm2835_spi.c		optional bcm2835_spi
 arm/broadcom/bcm2835/bcm2835_systimer.c		standard
 arm/broadcom/bcm2835/bcm2835_wdog.c		standard
 
-arm/arm/bus_space-v6.c				standard
+arm/arm/bus_space_base.c			standard
 arm/arm/bus_space_generic.c                     standard
 arm/arm/bus_space_asm_generic.S                 standard
 arm/arm/cpufunc_asm_arm11.S                     standard
diff --git a/sys/arm/freescale/imx/files.imx51 b/sys/arm/freescale/imx/files.imx51
index 951cb4d..986fc2c 100644
--- a/sys/arm/freescale/imx/files.imx51
+++ b/sys/arm/freescale/imx/files.imx51
@@ -10,7 +10,7 @@ kern/kern_clocksource.c			standard
 arm/freescale/imx/imx_common.c		standard
 arm/freescale/imx/imx_machdep.c		standard
 arm/freescale/imx/imx51_machdep.c	standard
-arm/arm/bus_space-v6.c			standard
+arm/arm/bus_space_base.c		standard
 
 # Dummy serial console
 #arm/freescale/imx/console.c		standard
diff --git a/sys/arm/freescale/imx/files.imx53 b/sys/arm/freescale/imx/files.imx53
index 3918400..c5dd30b 100644
--- a/sys/arm/freescale/imx/files.imx53
+++ b/sys/arm/freescale/imx/files.imx53
@@ -10,7 +10,7 @@ kern/kern_clocksource.c			standard
 arm/freescale/imx/imx_common.c		standard
 arm/freescale/imx/imx_machdep.c		standard
 arm/freescale/imx/imx53_machdep.c	standard
-arm/arm/bus_space-v6.c			standard
+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 2fc6d3f..df86ef9 100644
--- a/sys/arm/freescale/imx/files.imx6
+++ b/sys/arm/freescale/imx/files.imx6
@@ -15,7 +15,7 @@ kern/kern_clocksource.c			standard
 #
 arm/arm/gic.c				standard
 arm/arm/pl310.c				standard
-arm/arm/bus_space-v6.c			standard
+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 572a3ef..1d301f2 100644
--- a/sys/arm/freescale/vybrid/files.vybrid
+++ b/sys/arm/freescale/vybrid/files.vybrid
@@ -9,7 +9,7 @@ arm/arm/cpufunc_asm_arm10.S			standard
 arm/arm/cpufunc_asm_arm11.S			standard
 arm/arm/cpufunc_asm_armv7.S			standard
 
-arm/arm/bus_space-v6.c				standard
+arm/arm/bus_space_base.c			standard
 arm/arm/gic.c					standard
 arm/arm/mpcore_timer.c				standard
 
diff --git a/sys/arm/lpc/files.lpc b/sys/arm/lpc/files.lpc
index 8e196ad..1f8d768 100644
--- a/sys/arm/lpc/files.lpc
+++ b/sys/arm/lpc/files.lpc
@@ -1,5 +1,5 @@
 # $FreeBSD$
-arm/arm/bus_space-v6.c			standard
+arm/arm/bus_space_base.c		standard
 arm/arm/bus_space_generic.c		standard
 arm/arm/cpufunc_asm_arm9.S		standard
 arm/arm/cpufunc_asm_armv5.S		standard
diff --git a/sys/arm/mv/files.mv b/sys/arm/mv/files.mv
index 15622ae..d730c01 100644
--- a/sys/arm/mv/files.mv
+++ b/sys/arm/mv/files.mv
@@ -12,7 +12,7 @@
 # - JTAG/ICE
 # - Vector Floating Point (VFP) unit
 #
-arm/arm/bus_space-v6.c		standard
+arm/arm/bus_space_base.c	standard
 arm/arm/bus_space_generic.c	standard
 arm/arm/cpufunc_asm_arm10.S	standard
 arm/arm/cpufunc_asm_arm11.S	standard
diff --git a/sys/arm/rockchip/files.rk30xx b/sys/arm/rockchip/files.rk30xx
index 0bcc34c..4160c1e 100644
--- a/sys/arm/rockchip/files.rk30xx
+++ b/sys/arm/rockchip/files.rk30xx
@@ -11,7 +11,7 @@ arm/arm/cpufunc_asm_armv7.S		standard
 arm/arm/gic.c				standard
 arm/arm/mpcore_timer.c			standard
 
-arm/arm/bus_space-v6.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 3883b28..f1174dc 100644
--- a/sys/arm/samsung/exynos/files.exynos5
+++ b/sys/arm/samsung/exynos/files.exynos5
@@ -9,7 +9,7 @@ arm/arm/cpufunc_asm_arm10.S			standard
 arm/arm/cpufunc_asm_arm11.S			standard
 arm/arm/cpufunc_asm_armv7.S			standard
 
-arm/arm/bus_space-v6.c				standard
+arm/arm/bus_space_base.c			standard
 arm/arm/gic.c					standard
 arm/arm/generic_timer.c				standard
 
diff --git a/sys/arm/ti/files.ti b/sys/arm/ti/files.ti
index ef77cb9..52ee22b 100644
--- a/sys/arm/ti/files.ti
+++ b/sys/arm/ti/files.ti
@@ -2,7 +2,7 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space-v6.c				standard
+arm/arm/bus_space_base.c			standard
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
 arm/arm/cpufunc_asm_armv5.S			standard
diff --git a/sys/arm/xilinx/files.zynq7 b/sys/arm/xilinx/files.zynq7
index 9682904..19759ac 100644
--- a/sys/arm/xilinx/files.zynq7
+++ b/sys/arm/xilinx/files.zynq7
@@ -5,7 +5,7 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space-v6.c				standard
+arm/arm/bus_space_base.c			standard
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
 arm/arm/cpufunc_asm_armv5.S			standard