svn commit: r291133 - in head/sys: arm/allwinner arm/altera/socfpga arm/amlogic/aml8726 arm/annapurna/alpine arm/at91 arm/broadcom/bcm2835 arm/cavium/cns11xx arm/freescale/imx arm/freescale/vybrid ...

Andrew Turner andrew at FreeBSD.org
Sat Nov 21 15:30:12 UTC 2015


Author: andrew
Date: Sat Nov 21 15:30:08 2015
New Revision: 291133
URL: https://svnweb.freebsd.org/changeset/base/291133

Log:
  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

Modified:
  head/sys/arm/allwinner/files.allwinner
  head/sys/arm/altera/socfpga/files.socfpga
  head/sys/arm/amlogic/aml8726/files.aml8726
  head/sys/arm/annapurna/alpine/files.alpine
  head/sys/arm/at91/files.at91
  head/sys/arm/broadcom/bcm2835/files.bcm283x
  head/sys/arm/cavium/cns11xx/files.econa
  head/sys/arm/freescale/imx/files.imx5
  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/qemu/files.qemu
  head/sys/arm/rockchip/files.rk30xx
  head/sys/arm/samsung/exynos/files.exynos5
  head/sys/arm/ti/files.ti
  head/sys/arm/versatile/files.versatile
  head/sys/arm/xilinx/files.zynq7
  head/sys/arm/xscale/i80321/files.i80219
  head/sys/arm/xscale/i80321/files.i80321
  head/sys/arm/xscale/i8134x/files.i81342
  head/sys/arm/xscale/ixp425/files.ixp425
  head/sys/arm/xscale/pxa/files.pxa
  head/sys/conf/files.arm

Modified: head/sys/arm/allwinner/files.allwinner
==============================================================================
--- head/sys/arm/allwinner/files.allwinner	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/allwinner/files.allwinner	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/altera/socfpga/files.socfpga
==============================================================================
--- head/sys/arm/altera/socfpga/files.socfpga	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/altera/socfpga/files.socfpga	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/amlogic/aml8726/files.aml8726
==============================================================================
--- head/sys/arm/amlogic/aml8726/files.aml8726	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/amlogic/aml8726/files.aml8726	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/annapurna/alpine/files.alpine
==============================================================================
--- head/sys/arm/annapurna/alpine/files.alpine	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/annapurna/alpine/files.alpine	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/at91/files.at91
==============================================================================
--- head/sys/arm/at91/files.at91	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/at91/files.at91	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/broadcom/bcm2835/files.bcm283x
==============================================================================
--- head/sys/arm/broadcom/bcm2835/files.bcm283x	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/broadcom/bcm2835/files.bcm283x	Sat Nov 21 15:30:08 2015	(r291133)
@@ -16,9 +16,6 @@ arm/broadcom/bcm2835/bcm2835_vcio.c		sta
 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

Modified: head/sys/arm/cavium/cns11xx/files.econa
==============================================================================
--- head/sys/arm/cavium/cns11xx/files.econa	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/cavium/cns11xx/files.econa	Sat Nov 21 15:30:08 2015	(r291133)
@@ -6,7 +6,6 @@ arm/cavium/cns11xx/uart_bus_ec.c		option
 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

Modified: head/sys/arm/freescale/imx/files.imx5
==============================================================================
--- head/sys/arm/freescale/imx/files.imx5	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/freescale/imx/files.imx5	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/freescale/imx/files.imx6
==============================================================================
--- head/sys/arm/freescale/imx/files.imx6	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/freescale/imx/files.imx6	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/freescale/vybrid/files.vybrid
==============================================================================
--- head/sys/arm/freescale/vybrid/files.vybrid	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/freescale/vybrid/files.vybrid	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/lpc/files.lpc
==============================================================================
--- head/sys/arm/lpc/files.lpc	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/lpc/files.lpc	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/mv/files.mv
==============================================================================
--- head/sys/arm/mv/files.mv	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/mv/files.mv	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/qemu/files.qemu
==============================================================================
--- head/sys/arm/qemu/files.qemu	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/qemu/files.qemu	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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
 
 #

Modified: head/sys/arm/rockchip/files.rk30xx
==============================================================================
--- head/sys/arm/rockchip/files.rk30xx	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/rockchip/files.rk30xx	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/samsung/exynos/files.exynos5
==============================================================================
--- head/sys/arm/samsung/exynos/files.exynos5	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/samsung/exynos/files.exynos5	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/ti/files.ti
==============================================================================
--- head/sys/arm/ti/files.ti	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/ti/files.ti	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/versatile/files.versatile
==============================================================================
--- head/sys/arm/versatile/files.versatile	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/versatile/files.versatile	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/xilinx/files.zynq7
==============================================================================
--- head/sys/arm/xilinx/files.zynq7	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/xilinx/files.zynq7	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/xscale/i80321/files.i80219
==============================================================================
--- head/sys/arm/xscale/i80321/files.i80219	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/xscale/i80321/files.i80219	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/xscale/i80321/files.i80321
==============================================================================
--- head/sys/arm/xscale/i80321/files.i80321	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/xscale/i80321/files.i80321	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/xscale/i8134x/files.i81342
==============================================================================
--- head/sys/arm/xscale/i8134x/files.i81342	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/xscale/i8134x/files.i81342	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/xscale/ixp425/files.ixp425
==============================================================================
--- head/sys/arm/xscale/ixp425/files.ixp425	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/xscale/ixp425/files.ixp425	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/arm/xscale/pxa/files.pxa
==============================================================================
--- head/sys/arm/xscale/pxa/files.pxa	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/arm/xscale/pxa/files.pxa	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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

Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm	Sat Nov 21 14:39:57 2015	(r291132)
+++ head/sys/conf/files.arm	Sat Nov 21 15:30:08 2015	(r291133)
@@ -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


More information about the svn-src-head mailing list