From 94008dd35ffbf1f22f8b431d181a3704dfc81a03 Mon Sep 17 00:00:00 2001 From: manu Date: Tue, 16 Apr 2019 20:04:22 +0000 Subject: [PATCH] arm: Add kern_clocksource.c directly in files.arm This files is needed and included in all our config so move it to a common location. MFC after: 2 weeks --- sys/arm/allwinner/files.allwinner | 1 - sys/arm/altera/socfpga/files.socfpga | 2 -- sys/arm/amlogic/aml8726/files.aml8726 | 2 -- sys/arm/annapurna/alpine/files.alpine | 2 -- sys/arm/broadcom/bcm2835/files.bcm283x | 2 -- sys/arm/freescale/imx/files.imx5 | 1 - sys/arm/freescale/imx/files.imx6 | 5 ----- sys/arm/freescale/vybrid/files.vybrid | 2 -- sys/arm/mv/files.arm7 | 2 -- sys/arm/mv/files.mv | 2 -- sys/arm/nvidia/tegra124/files.tegra124 | 5 ----- sys/arm/qemu/files.qemu | 5 ----- sys/arm/ralink/files.ralink | 2 -- sys/arm/rockchip/files.rk30xx | 1 - sys/arm/samsung/exynos/files.exynos5 | 2 -- sys/arm/ti/files.ti | 2 -- sys/arm/versatile/files.versatile | 2 -- sys/arm/xilinx/files.zynq7 | 2 -- sys/conf/files.arm | 4 ++++ 19 files changed, 4 insertions(+), 42 deletions(-) diff --git a/sys/arm/allwinner/files.allwinner b/sys/arm/allwinner/files.allwinner index c2bc15f2c553..55feb32d21f4 100644 --- a/sys/arm/allwinner/files.allwinner +++ b/sys/arm/allwinner/files.allwinner @@ -1,5 +1,4 @@ # $FreeBSD$ -kern/kern_clocksource.c standard arm/allwinner/a10_ahci.c optional ahci arm/allwinner/a10_codec.c optional sound diff --git a/sys/arm/altera/socfpga/files.socfpga b/sys/arm/altera/socfpga/files.socfpga index 0aef6887858b..06275c47f85b 100644 --- a/sys/arm/altera/socfpga/files.socfpga +++ b/sys/arm/altera/socfpga/files.socfpga @@ -1,7 +1,5 @@ # $FreeBSD$ -kern/kern_clocksource.c standard - arm/altera/socfpga/socfpga_common.c standard arm/altera/socfpga/socfpga_machdep.c standard arm/altera/socfpga/socfpga_manager.c standard diff --git a/sys/arm/amlogic/aml8726/files.aml8726 b/sys/arm/amlogic/aml8726/files.aml8726 index edd9a0805c86..addf35b79b84 100644 --- a/sys/arm/amlogic/aml8726/files.aml8726 +++ b/sys/arm/amlogic/aml8726/files.aml8726 @@ -1,7 +1,5 @@ #$FreeBSD$ -kern/kern_clocksource.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 8bd33c3794df..4d97f40d9736 100644 --- a/sys/arm/annapurna/alpine/files.alpine +++ b/sys/arm/annapurna/alpine/files.alpine @@ -1,7 +1,5 @@ # $FreeBSD$ -kern/kern_clocksource.c standard - arm/versatile/sp804.c standard dev/uart/uart_dev_ns8250.c optional uart diff --git a/sys/arm/broadcom/bcm2835/files.bcm283x b/sys/arm/broadcom/bcm2835/files.bcm283x index 9e50c2a04750..d2ce81d2cc1f 100644 --- a/sys/arm/broadcom/bcm2835/files.bcm283x +++ b/sys/arm/broadcom/bcm2835/files.bcm283x @@ -18,8 +18,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 -kern/kern_clocksource.c standard - dev/mbox/mbox_if.m standard arm/broadcom/bcm2835/bcm2835_audio.c optional sound vchiq \ diff --git a/sys/arm/freescale/imx/files.imx5 b/sys/arm/freescale/imx/files.imx5 index 1cbbcb28b173..11ffb3e6adf6 100644 --- a/sys/arm/freescale/imx/files.imx5 +++ b/sys/arm/freescale/imx/files.imx5 @@ -1,5 +1,4 @@ # $FreeBSD$ -kern/kern_clocksource.c standard # Init arm/freescale/imx/imx_common.c standard diff --git a/sys/arm/freescale/imx/files.imx6 b/sys/arm/freescale/imx/files.imx6 index 2b68021f2336..caa7a099101c 100644 --- a/sys/arm/freescale/imx/files.imx6 +++ b/sys/arm/freescale/imx/files.imx6 @@ -1,10 +1,5 @@ # $FreeBSD$ -# -# Standard ARM support. -# -kern/kern_clocksource.c standard - # # Standard imx6 devices and support. # diff --git a/sys/arm/freescale/vybrid/files.vybrid b/sys/arm/freescale/vybrid/files.vybrid index 4a1fedfaa2b5..9922481a239a 100644 --- a/sys/arm/freescale/vybrid/files.vybrid +++ b/sys/arm/freescale/vybrid/files.vybrid @@ -1,7 +1,5 @@ # $FreeBSD$ -kern/kern_clocksource.c standard - arm/freescale/vybrid/vf_machdep.c standard arm/freescale/vybrid/vf_ccm.c standard arm/freescale/vybrid/vf_anadig.c standard diff --git a/sys/arm/mv/files.arm7 b/sys/arm/mv/files.arm7 index e5f7840726d4..d27357480cae 100644 --- a/sys/arm/mv/files.arm7 +++ b/sys/arm/mv/files.arm7 @@ -36,5 +36,3 @@ dev/uart/uart_dev_snps.c optional uart dev/usb/controller/ehci_mv.c optional ehci dev/usb/controller/generic_xhci.c optional xhci dev/ahci/ahci_mv_fdt.c optional ahci - -kern/kern_clocksource.c standard diff --git a/sys/arm/mv/files.mv b/sys/arm/mv/files.mv index 0a452dcac35f..ee027f059441 100644 --- a/sys/arm/mv/files.mv +++ b/sys/arm/mv/files.mv @@ -33,5 +33,3 @@ dev/uart/uart_dev_snps.c optional uart dev/usb/controller/ehci_mv.c optional ehci dev/usb/controller/generic_xhci.c optional xhci dev/ahci/ahci_mv_fdt.c optional ahci - -kern/kern_clocksource.c standard diff --git a/sys/arm/nvidia/tegra124/files.tegra124 b/sys/arm/nvidia/tegra124/files.tegra124 index 16a58cde470d..10f4a8899d32 100644 --- a/sys/arm/nvidia/tegra124/files.tegra124 +++ b/sys/arm/nvidia/tegra124/files.tegra124 @@ -1,10 +1,5 @@ # $FreeBSD$ -# -# Standard ARM support. -# -kern/kern_clocksource.c standard - # # Standard tegra124 devices and support. # diff --git a/sys/arm/qemu/files.qemu b/sys/arm/qemu/files.qemu index 600cda594673..91992f1b5104 100644 --- a/sys/arm/qemu/files.qemu +++ b/sys/arm/qemu/files.qemu @@ -1,10 +1,5 @@ # $FreeBSD$ -# -# Standard ARM support. -# -kern/kern_clocksource.c standard - # # Standard qemu virt devices and support. # diff --git a/sys/arm/ralink/files.ralink b/sys/arm/ralink/files.ralink index 10f18ddd6c02..9916329a9a8f 100644 --- a/sys/arm/ralink/files.ralink +++ b/sys/arm/ralink/files.ralink @@ -5,5 +5,3 @@ arm/ralink/rt1310_gpio.c optional rt1310gpio arm/ralink/rt1310_timer.c standard arm/ralink/if_fv.c optional fv -kern/kern_clocksource.c standard - diff --git a/sys/arm/rockchip/files.rk30xx b/sys/arm/rockchip/files.rk30xx index 53c4cf0dae45..50496a7b834a 100644 --- a/sys/arm/rockchip/files.rk30xx +++ b/sys/arm/rockchip/files.rk30xx @@ -1,5 +1,4 @@ # $FreeBSD$ -kern/kern_clocksource.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 aea6a670b7d2..4d6c6771eb9c 100644 --- a/sys/arm/samsung/exynos/files.exynos5 +++ b/sys/arm/samsung/exynos/files.exynos5 @@ -1,7 +1,5 @@ # $FreeBSD$ -kern/kern_clocksource.c standard - arm/samsung/exynos/exynos5_mct.c standard arm/samsung/exynos/exynos5_mp.c optional smp arm/samsung/exynos/exynos5_machdep.c standard diff --git a/sys/arm/ti/files.ti b/sys/arm/ti/files.ti index 49f37c1a0398..c0c708b5348c 100644 --- a/sys/arm/ti/files.ti +++ b/sys/arm/ti/files.ti @@ -1,7 +1,5 @@ #$FreeBSD$ -kern/kern_clocksource.c standard - arm/ti/ti_cpuid.c standard arm/ti/ti_hwmods.c standard arm/ti/ti_machdep.c standard diff --git a/sys/arm/versatile/files.versatile b/sys/arm/versatile/files.versatile index 38c1058d0261..42d5c519c0c5 100644 --- a/sys/arm/versatile/files.versatile +++ b/sys/arm/versatile/files.versatile @@ -8,5 +8,3 @@ arm/versatile/versatile_common.c standard arm/versatile/versatile_pci.c optional pci arm/versatile/versatile_scm.c standard arm/versatile/versatile_sic.c standard - -kern/kern_clocksource.c standard diff --git a/sys/arm/xilinx/files.zynq7 b/sys/arm/xilinx/files.zynq7 index bf4c21eef44c..0c1e217b97dd 100644 --- a/sys/arm/xilinx/files.zynq7 +++ b/sys/arm/xilinx/files.zynq7 @@ -3,8 +3,6 @@ # # $FreeBSD$ -kern/kern_clocksource.c standard - arm/xilinx/zy7_machdep.c standard arm/xilinx/zy7_l2cache.c standard arm/xilinx/zy7_slcr.c standard diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 6795942875b0..ebff952fcf34 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -11,6 +11,9 @@ cloudabi32_vdso_blob.o optional compat_cloudabi32 \ no-implicit-rule \ clean "cloudabi32_vdso_blob.o" # + +kern/kern_clocksource.c standard + arm/annapurna/alpine/alpine_ccu.c optional al_ccu fdt arm/annapurna/alpine/alpine_nb_service.c optional al_nb_service fdt arm/annapurna/alpine/alpine_pci.c optional al_pci fdt @@ -167,3 +170,4 @@ libkern/qdivrem.c standard libkern/ucmpdi2.c standard libkern/udivdi3.c standard libkern/umoddi3.c standard +