From 210d6af74da1582e9ae9661dc7e6cb78d8cb41dc Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Sat, 21 Nov 2015 15:30:08 +0000 Subject: 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 --- sys/arm/allwinner/files.allwinner | 3 --- sys/arm/altera/socfpga/files.socfpga | 3 --- sys/arm/amlogic/aml8726/files.aml8726 | 3 --- sys/arm/annapurna/alpine/files.alpine | 3 --- sys/arm/at91/files.at91 | 1 - sys/arm/broadcom/bcm2835/files.bcm283x | 3 --- sys/arm/cavium/cns11xx/files.econa | 1 - sys/arm/freescale/imx/files.imx5 | 2 -- sys/arm/freescale/imx/files.imx6 | 2 -- sys/arm/freescale/vybrid/files.vybrid | 3 --- sys/arm/lpc/files.lpc | 2 -- sys/arm/mv/files.mv | 3 --- sys/arm/qemu/files.qemu | 2 -- sys/arm/rockchip/files.rk30xx | 3 --- sys/arm/samsung/exynos/files.exynos5 | 3 --- sys/arm/ti/files.ti | 3 --- sys/arm/versatile/files.versatile | 3 --- sys/arm/xilinx/files.zynq7 | 3 --- sys/arm/xscale/i80321/files.i80219 | 2 -- sys/arm/xscale/i80321/files.i80321 | 2 -- sys/arm/xscale/i8134x/files.i81342 | 1 - sys/arm/xscale/ixp425/files.ixp425 | 1 - sys/arm/xscale/pxa/files.pxa | 2 -- sys/conf/files.arm | 2 ++ 24 files changed, 2 insertions(+), 54 deletions(-) (limited to 'sys') diff --git a/sys/arm/allwinner/files.allwinner b/sys/arm/allwinner/files.allwinner index 0a259dc92c1a..ea59bc27f8d9 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 955cbc5c0ff7..40890843236a 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 ebb42f762023..5b2df669d76f 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 729bdc91a94d..e1bba4b2faa5 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 7f4cb89b40f4..84056a4e1ed4 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 7a834e894ea3..bcd2bea3ceef 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 13e1bf6f7599..415822948379 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 6c37bf8b0f2f..aaea85116bb7 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 92d3299e6149..b5271d5fc20e 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 27799f670a6d..20c1699033c2 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 01715d3e3b66..7c410160af64 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 fd5c5f182942..78b5548fb367 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 48d7e4a8614f..0ba925e9fe44 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 276a9938e508..721eb95636b1 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 b8ea8a604a13..589cc77f5e46 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 d2a4ee44a1f8..d4daab131fd8 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 99562a40377f..c7dabb7bff84 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 8643a9ec1671..008e0f7f02cc 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 1162161318fc..306376bbdd25 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 4f41cecc9c83..bd318af1f650 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 31c78d27d02a..ed93e6bf855a 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 9a34b23b1665..4da51f05071f 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 a9a4fcf4635e..652877060dcb 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 66c8daf7e94e..de23a6e353d7 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 -- cgit v1.2.3