svn commit: r278722 - in stable/10/sys/arm: allwinner allwinner/a20 freescale/imx rockchip

[Ian Lepore]

Author: ian
Date: Fri Feb 13 22:01:14 2015
New Revision: 278722
URL: https://svnweb.freebsd.org/changeset/base/278722

Log:
  MFC r257740, r257739:  Switch to using common armv6 bus_space tag.

Deleted:
  stable/10/sys/arm/allwinner/bus_space.c
  stable/10/sys/arm/freescale/imx/bus_space.c
  stable/10/sys/arm/rockchip/bus_space.c
Modified:
  stable/10/sys/arm/allwinner/a20/files.a20
  stable/10/sys/arm/allwinner/files.a10
  stable/10/sys/arm/freescale/imx/files.imx51
  stable/10/sys/arm/freescale/imx/files.imx53
  stable/10/sys/arm/freescale/imx/files.imx6
  stable/10/sys/arm/rockchip/files.rk30xx
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/allwinner/a20/files.a20
==============================================================================
--- stable/10/sys/arm/allwinner/a20/files.a20	Fri Feb 13 21:46:22 2015	(r278721)
+++ stable/10/sys/arm/allwinner/a20/files.a20	Fri Feb 13 22:01:14 2015	(r278722)
@@ -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/allwinner/bus_space.c		standard
+arm/arm/bus_space-v6.c			standard
 arm/allwinner/a10_common.c			standard
 arm/allwinner/a10_machdep.c		standard
 arm/allwinner/a20/a20_mp.c		optional	smp

Modified: stable/10/sys/arm/allwinner/files.a10
==============================================================================
--- stable/10/sys/arm/allwinner/files.a10	Fri Feb 13 21:46:22 2015	(r278721)
+++ stable/10/sys/arm/allwinner/files.a10	Fri Feb 13 22:01:14 2015	(r278722)
@@ -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/allwinner/bus_space.c		standard
+arm/arm/bus_space-v6.c			standard
 #arm/allwinner/console.c			standard

Modified: stable/10/sys/arm/freescale/imx/files.imx51
==============================================================================
--- stable/10/sys/arm/freescale/imx/files.imx51	Fri Feb 13 21:46:22 2015	(r278721)
+++ stable/10/sys/arm/freescale/imx/files.imx51	Fri Feb 13 22:01:14 2015	(r278722)
@@ -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/freescale/imx/bus_space.c		standard
+arm/arm/bus_space-v6.c			standard
 
 # Dummy serial console
 #arm/freescale/imx/console.c		standard

Modified: stable/10/sys/arm/freescale/imx/files.imx53
==============================================================================
--- stable/10/sys/arm/freescale/imx/files.imx53	Fri Feb 13 21:46:22 2015	(r278721)
+++ stable/10/sys/arm/freescale/imx/files.imx53	Fri Feb 13 22:01:14 2015	(r278722)
@@ -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/freescale/imx/bus_space.c		standard
+arm/arm/bus_space-v6.c			standard
 
 # Special serial console for debuging early boot code
 #arm/freescale/imx/console.c		standard

Modified: stable/10/sys/arm/freescale/imx/files.imx6
==============================================================================
--- stable/10/sys/arm/freescale/imx/files.imx6	Fri Feb 13 21:46:22 2015	(r278721)
+++ stable/10/sys/arm/freescale/imx/files.imx6	Fri Feb 13 22:01:14 2015	(r278722)
@@ -15,7 +15,7 @@ kern/kern_clocksource.c			standard
 #
 arm/arm/gic.c				standard
 arm/arm/pl310.c				standard
-arm/freescale/imx/bus_space.c		standard
+arm/arm/bus_space-v6.c			standard
 arm/arm/mpcore_timer.c			standard
 arm/freescale/fsl_ocotp.c		standard
 arm/freescale/imx/imx6_anatop.c		standard

Modified: stable/10/sys/arm/rockchip/files.rk30xx
==============================================================================
--- stable/10/sys/arm/rockchip/files.rk30xx	Fri Feb 13 21:46:22 2015	(r278721)
+++ stable/10/sys/arm/rockchip/files.rk30xx	Fri Feb 13 22:01:14 2015	(r278722)
@@ -11,7 +11,7 @@ arm/arm/cpufunc_asm_armv7.S		standard
 arm/arm/gic.c				standard
 arm/arm/mpcore_timer.c			standard
 
-arm/rockchip/bus_space.c		standard
+arm/arm/bus_space-v6.c			standard
 arm/rockchip/rk30xx_common.c		standard
 arm/rockchip/rk30xx_machdep.c		standard
 arm/rockchip/rk30xx_pmu.c		standard