From 3632d4118ee1c2b4010b0a1448d3b35686ffb34f Mon Sep 17 00:00:00 2001 From: manu Date: Thu, 28 Dec 2017 07:31:14 +0000 Subject: [PATCH] Revert r327250 as it broke the build for some armv6 kernel and all armv4/5 Reported by: ian --- 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/lpc/files.lpc | 1 + 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 | 1 - 19 files changed, 41 insertions(+), 1 deletion(-) diff --git a/sys/arm/allwinner/files.allwinner b/sys/arm/allwinner/files.allwinner index 61828fa0113d..e62db3cedd22 100644 --- a/sys/arm/allwinner/files.allwinner +++ b/sys/arm/allwinner/files.allwinner @@ -1,4 +1,5 @@ # $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 804d72fd41e1..ea29d0e35de0 100644 --- a/sys/arm/altera/socfpga/files.socfpga +++ b/sys/arm/altera/socfpga/files.socfpga @@ -1,5 +1,7 @@ # $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 addf35b79b84..edd9a0805c86 100644 --- a/sys/arm/amlogic/aml8726/files.aml8726 +++ b/sys/arm/amlogic/aml8726/files.aml8726 @@ -1,5 +1,7 @@ #$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 4d97f40d9736..8bd33c3794df 100644 --- a/sys/arm/annapurna/alpine/files.alpine +++ b/sys/arm/annapurna/alpine/files.alpine @@ -1,5 +1,7 @@ # $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 df40885ab10b..08acfaf4706d 100644 --- a/sys/arm/broadcom/bcm2835/files.bcm283x +++ b/sys/arm/broadcom/bcm2835/files.bcm283x @@ -17,6 +17,8 @@ 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 c1018f6b3342..31a7a62bb65a 100644 --- a/sys/arm/freescale/imx/files.imx5 +++ b/sys/arm/freescale/imx/files.imx5 @@ -1,4 +1,5 @@ # $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 352e6adc7edc..7819d3b7b233 100644 --- a/sys/arm/freescale/imx/files.imx6 +++ b/sys/arm/freescale/imx/files.imx6 @@ -1,5 +1,10 @@ # $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 9922481a239a..4a1fedfaa2b5 100644 --- a/sys/arm/freescale/vybrid/files.vybrid +++ b/sys/arm/freescale/vybrid/files.vybrid @@ -1,5 +1,7 @@ # $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/lpc/files.lpc b/sys/arm/lpc/files.lpc index 6894e4e85918..7c410160af64 100644 --- a/sys/arm/lpc/files.lpc +++ b/sys/arm/lpc/files.lpc @@ -13,3 +13,4 @@ arm/lpc/lpc_spi.c optional lpcspi arm/lpc/lpc_dmac.c optional dmac arm/lpc/ssd1289.c optional ssd1289 dev/uart/uart_dev_lpc.c optional uart +kern/kern_clocksource.c standard diff --git a/sys/arm/mv/files.mv b/sys/arm/mv/files.mv index c823431b5865..b37a2a66fb33 100644 --- a/sys/arm/mv/files.mv +++ b/sys/arm/mv/files.mv @@ -33,3 +33,5 @@ dev/uart/uart_dev_snps.c optional uart dev/usb/controller/ehci_mv.c optional ehci dev/usb/controller/xhci_mv.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 10f4a8899d32..16a58cde470d 100644 --- a/sys/arm/nvidia/tegra124/files.tegra124 +++ b/sys/arm/nvidia/tegra124/files.tegra124 @@ -1,5 +1,10 @@ # $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 91992f1b5104..600cda594673 100644 --- a/sys/arm/qemu/files.qemu +++ b/sys/arm/qemu/files.qemu @@ -1,5 +1,10 @@ # $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 9916329a9a8f..10f18ddd6c02 100644 --- a/sys/arm/ralink/files.ralink +++ b/sys/arm/ralink/files.ralink @@ -5,3 +5,5 @@ 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 dbb4fd7a6ad7..b058ed91c574 100644 --- a/sys/arm/rockchip/files.rk30xx +++ b/sys/arm/rockchip/files.rk30xx @@ -1,4 +1,5 @@ # $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 e00daee33a8f..84c92c49c83a 100644 --- a/sys/arm/samsung/exynos/files.exynos5 +++ b/sys/arm/samsung/exynos/files.exynos5 @@ -1,5 +1,7 @@ # $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 c0c708b5348c..49f37c1a0398 100644 --- a/sys/arm/ti/files.ti +++ b/sys/arm/ti/files.ti @@ -1,5 +1,7 @@ #$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 42d5c519c0c5..38c1058d0261 100644 --- a/sys/arm/versatile/files.versatile +++ b/sys/arm/versatile/files.versatile @@ -8,3 +8,5 @@ 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 da579da825ae..a1292d00aa92 100644 --- a/sys/arm/xilinx/files.zynq7 +++ b/sys/arm/xilinx/files.zynq7 @@ -3,6 +3,8 @@ # # $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 be3e45a548e5..10c86e5ce4ac 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -145,7 +145,6 @@ font.h optional sc \ compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ no-obj no-implicit-rule before-depend \ clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" -kern/kern_clocksource.c standard kern/msi_if.m optional intrng kern/pic_if.m optional intrng kern/subr_busdma_bufalloc.c standard