Author: ian
Date: Wed Jan 21 03:44:29 2015
New Revision: 277472
URL: https://svnweb.freebsd.org/changeset/base/277472
Log:
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.
Added:
head/sys/arm/arm/bus_space_base.c
- copied, changed from r277470, head/sys/arm/arm/bus_space-v6.c
Deleted:
head/sys/arm/arm/bus_space-v6.c
Modified:
head/sys/arm/allwinner/a20/files.a20
head/sys/arm/allwinner/files.a10
head/sys/arm/altera/socfpga/files.socfpga
head/sys/arm/broadcom/bcm2835/files.bcm2835
head/sys/arm/freescale/imx/files.imx51
head/sys/arm/freescale/imx/files.imx53
head/sys/arm/freescale/imx/files.imx6
head/sys/arm/freescale/vybrid/files.vybrid
head/sys/arm/lpc/files.lpc
head/sys/arm/mv/files.mv
head/sys/arm/rockchip/files.rk30xx
head/sys/arm/samsung/exynos/files.exynos5
head/sys/arm/ti/files.ti
head/sys/arm/xilinx/files.zynq7
Modified: head/sys/arm/allwinner/a20/files.a20
==============================================================================
--- head/sys/arm/allwinner/a20/files.a20 Wed Jan 21 03:28:07 2015
(r277471)
+++ head/sys/arm/allwinner/a20/files.a20 Wed Jan 21 03:44:29 2015
(r277472)
@@ -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
Modified: head/sys/arm/allwinner/files.a10
==============================================================================
--- head/sys/arm/allwinner/files.a10 Wed Jan 21 03:28:07 2015
(r277471)
+++ head/sys/arm/allwinner/files.a10 Wed Jan 21 03:44:29 2015
(r277472)
@@ -19,5 +19,5 @@ arm/allwinner/a20/a20_cpu_cfg.c standar
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
Modified: head/sys/arm/altera/socfpga/files.socfpga
==============================================================================
--- head/sys/arm/altera/socfpga/files.socfpga Wed Jan 21 03:28:07 2015
(r277471)
+++ head/sys/arm/altera/socfpga/files.socfpga Wed Jan 21 03:44:29 2015
(r277472)
@@ -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
Copied and modified: head/sys/arm/arm/bus_space_base.c (from r277470,
head/sys/arm/arm/bus_space-v6.c)
==============================================================================
--- head/sys/arm/arm/bus_space-v6.c Wed Jan 21 03:24:18 2015
(r277470, copy source)
+++ head/sys/arm/arm/bus_space_base.c Wed Jan 21 03:44:29 2015
(r277472)
@@ -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
Modified: head/sys/arm/broadcom/bcm2835/files.bcm2835
==============================================================================
--- head/sys/arm/broadcom/bcm2835/files.bcm2835 Wed Jan 21 03:28:07 2015
(r277471)
+++ head/sys/arm/broadcom/bcm2835/files.bcm2835 Wed Jan 21 03:44:29 2015
(r277472)
@@ -15,7 +15,7 @@ arm/broadcom/bcm2835/bcm2835_spi.c opti
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
Modified: head/sys/arm/freescale/imx/files.imx51
==============================================================================
--- head/sys/arm/freescale/imx/files.imx51 Wed Jan 21 03:28:07 2015
(r277471)
+++ head/sys/arm/freescale/imx/files.imx51 Wed Jan 21 03:44:29 2015
(r277472)
@@ -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
Modified: head/sys/arm/freescale/imx/files.imx53
==============================================================================
--- head/sys/arm/freescale/imx/files.imx53 Wed Jan 21 03:28:07 2015
(r277471)
+++ head/sys/arm/freescale/imx/files.imx53 Wed Jan 21 03:44:29 2015
(r277472)
@@ -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
Modified: head/sys/arm/freescale/imx/files.imx6
==============================================================================
--- head/sys/arm/freescale/imx/files.imx6 Wed Jan 21 03:28:07 2015
(r277471)
+++ head/sys/arm/freescale/imx/files.imx6 Wed Jan 21 03:44:29 2015
(r277472)
@@ -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
Modified: head/sys/arm/freescale/vybrid/files.vybrid
==============================================================================
--- head/sys/arm/freescale/vybrid/files.vybrid Wed Jan 21 03:28:07 2015
(r277471)
+++ head/sys/arm/freescale/vybrid/files.vybrid Wed Jan 21 03:44:29 2015
(r277472)
@@ -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
Modified: head/sys/arm/lpc/files.lpc
==============================================================================
--- head/sys/arm/lpc/files.lpc Wed Jan 21 03:28:07 2015 (r277471)
+++ head/sys/arm/lpc/files.lpc Wed Jan 21 03:44:29 2015 (r277472)
@@ -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
Modified: head/sys/arm/mv/files.mv
==============================================================================
--- head/sys/arm/mv/files.mv Wed Jan 21 03:28:07 2015 (r277471)
+++ head/sys/arm/mv/files.mv Wed Jan 21 03:44:29 2015 (r277472)
@@ -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
Modified: head/sys/arm/rockchip/files.rk30xx
==============================================================================
--- head/sys/arm/rockchip/files.rk30xx Wed Jan 21 03:28:07 2015
(r277471)
+++ head/sys/arm/rockchip/files.rk30xx Wed Jan 21 03:44:29 2015
(r277472)
@@ -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
Modified: head/sys/arm/samsung/exynos/files.exynos5
==============================================================================
--- head/sys/arm/samsung/exynos/files.exynos5 Wed Jan 21 03:28:07 2015
(r277471)
+++ head/sys/arm/samsung/exynos/files.exynos5 Wed Jan 21 03:44:29 2015
(r277472)
@@ -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
Modified: head/sys/arm/ti/files.ti
==============================================================================
--- head/sys/arm/ti/files.ti Wed Jan 21 03:28:07 2015 (r277471)
+++ head/sys/arm/ti/files.ti Wed Jan 21 03:44:29 2015 (r277472)
@@ -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
Modified: head/sys/arm/xilinx/files.zynq7
==============================================================================
--- head/sys/arm/xilinx/files.zynq7 Wed Jan 21 03:28:07 2015
(r277471)
+++ head/sys/arm/xilinx/files.zynq7 Wed Jan 21 03:44:29 2015
(r277472)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
