Author: manu
Date: Mon Aug 5 18:13:13 2019
New Revision: 350603
URL: https://svnweb.freebsd.org/changeset/base/350603
Log:
MFC r346295, r346297
r346295:
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.
r346297:
arm: Order files.arm to have cloudabi and annapurna sections
Modified:
stable/12/sys/arm/allwinner/files.allwinner
stable/12/sys/arm/altera/socfpga/files.socfpga
stable/12/sys/arm/amlogic/aml8726/files.aml8726
stable/12/sys/arm/annapurna/alpine/files.alpine
stable/12/sys/arm/broadcom/bcm2835/files.bcm283x
stable/12/sys/arm/freescale/imx/files.imx5
stable/12/sys/arm/freescale/imx/files.imx6
stable/12/sys/arm/freescale/vybrid/files.vybrid
stable/12/sys/arm/mv/files.arm7
stable/12/sys/arm/mv/files.mv
stable/12/sys/arm/nvidia/tegra124/files.tegra124
stable/12/sys/arm/qemu/files.qemu
stable/12/sys/arm/ralink/files.ralink
stable/12/sys/arm/rockchip/files.rk30xx
stable/12/sys/arm/samsung/exynos/files.exynos5
stable/12/sys/arm/ti/files.ti
stable/12/sys/arm/versatile/files.versatile
stable/12/sys/arm/xilinx/files.zynq7
stable/12/sys/conf/files.arm
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/arm/allwinner/files.allwinner
==============================================================================
--- stable/12/sys/arm/allwinner/files.allwinner Mon Aug 5 18:05:22 2019
(r350602)
+++ stable/12/sys/arm/allwinner/files.allwinner Mon Aug 5 18:13:13 2019
(r350603)
@@ -1,5 +1,4 @@
# $FreeBSD$
-kern/kern_clocksource.c standard
arm/allwinner/a10_ahci.c optional ahci
arm/allwinner/a10_codec.c optional sound
Modified: stable/12/sys/arm/altera/socfpga/files.socfpga
==============================================================================
--- stable/12/sys/arm/altera/socfpga/files.socfpga Mon Aug 5 18:05:22
2019 (r350602)
+++ stable/12/sys/arm/altera/socfpga/files.socfpga Mon Aug 5 18:13:13
2019 (r350603)
@@ -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
Modified: stable/12/sys/arm/amlogic/aml8726/files.aml8726
==============================================================================
--- stable/12/sys/arm/amlogic/aml8726/files.aml8726 Mon Aug 5 18:05:22
2019 (r350602)
+++ stable/12/sys/arm/amlogic/aml8726/files.aml8726 Mon Aug 5 18:13:13
2019 (r350603)
@@ -1,7 +1,5 @@
#$FreeBSD$
-kern/kern_clocksource.c standard
-
arm/amlogic/aml8726/aml8726_l2cache.c standard
arm/amlogic/aml8726/aml8726_machdep.c standard
Modified: stable/12/sys/arm/annapurna/alpine/files.alpine
==============================================================================
--- stable/12/sys/arm/annapurna/alpine/files.alpine Mon Aug 5 18:05:22
2019 (r350602)
+++ stable/12/sys/arm/annapurna/alpine/files.alpine Mon Aug 5 18:13:13
2019 (r350603)
@@ -1,7 +1,5 @@
# $FreeBSD$
-kern/kern_clocksource.c standard
-
arm/versatile/sp804.c standard
dev/uart/uart_dev_ns8250.c optional uart
Modified: stable/12/sys/arm/broadcom/bcm2835/files.bcm283x
==============================================================================
--- stable/12/sys/arm/broadcom/bcm2835/files.bcm283x Mon Aug 5 18:05:22
2019 (r350602)
+++ stable/12/sys/arm/broadcom/bcm2835/files.bcm283x Mon Aug 5 18:13:13
2019 (r350603)
@@ -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 \
Modified: stable/12/sys/arm/freescale/imx/files.imx5
==============================================================================
--- stable/12/sys/arm/freescale/imx/files.imx5 Mon Aug 5 18:05:22 2019
(r350602)
+++ stable/12/sys/arm/freescale/imx/files.imx5 Mon Aug 5 18:13:13 2019
(r350603)
@@ -1,5 +1,4 @@
# $FreeBSD$
-kern/kern_clocksource.c standard
# Init
arm/freescale/imx/imx_common.c standard
Modified: stable/12/sys/arm/freescale/imx/files.imx6
==============================================================================
--- stable/12/sys/arm/freescale/imx/files.imx6 Mon Aug 5 18:05:22 2019
(r350602)
+++ stable/12/sys/arm/freescale/imx/files.imx6 Mon Aug 5 18:13:13 2019
(r350603)
@@ -1,11 +1,6 @@
# $FreeBSD$
#
-# Standard ARM support.
-#
-kern/kern_clocksource.c standard
-
-#
# Standard imx6 devices and support.
#
arm/freescale/fsl_ocotp.c standard
Modified: stable/12/sys/arm/freescale/vybrid/files.vybrid
==============================================================================
--- stable/12/sys/arm/freescale/vybrid/files.vybrid Mon Aug 5 18:05:22
2019 (r350602)
+++ stable/12/sys/arm/freescale/vybrid/files.vybrid Mon Aug 5 18:13:13
2019 (r350603)
@@ -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
Modified: stable/12/sys/arm/mv/files.arm7
==============================================================================
--- stable/12/sys/arm/mv/files.arm7 Mon Aug 5 18:05:22 2019
(r350602)
+++ stable/12/sys/arm/mv/files.arm7 Mon Aug 5 18:13:13 2019
(r350603)
@@ -35,5 +35,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
Modified: stable/12/sys/arm/mv/files.mv
==============================================================================
--- stable/12/sys/arm/mv/files.mv Mon Aug 5 18:05:22 2019
(r350602)
+++ stable/12/sys/arm/mv/files.mv Mon Aug 5 18:13:13 2019
(r350603)
@@ -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
Modified: stable/12/sys/arm/nvidia/tegra124/files.tegra124
==============================================================================
--- stable/12/sys/arm/nvidia/tegra124/files.tegra124 Mon Aug 5 18:05:22
2019 (r350602)
+++ stable/12/sys/arm/nvidia/tegra124/files.tegra124 Mon Aug 5 18:13:13
2019 (r350603)
@@ -1,11 +1,6 @@
# $FreeBSD$
#
-# Standard ARM support.
-#
-kern/kern_clocksource.c standard
-
-#
# Standard tegra124 devices and support.
#
arm/nvidia/tegra124/tegra124_machdep.c standard
Modified: stable/12/sys/arm/qemu/files.qemu
==============================================================================
--- stable/12/sys/arm/qemu/files.qemu Mon Aug 5 18:05:22 2019
(r350602)
+++ stable/12/sys/arm/qemu/files.qemu Mon Aug 5 18:13:13 2019
(r350603)
@@ -1,11 +1,6 @@
# $FreeBSD$
#
-# Standard ARM support.
-#
-kern/kern_clocksource.c standard
-
-#
# Standard qemu virt devices and support.
#
arm/qemu/virt_machdep.c standard
Modified: stable/12/sys/arm/ralink/files.ralink
==============================================================================
--- stable/12/sys/arm/ralink/files.ralink Mon Aug 5 18:05:22 2019
(r350602)
+++ stable/12/sys/arm/ralink/files.ralink Mon Aug 5 18:13:13 2019
(r350603)
@@ -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
-
Modified: stable/12/sys/arm/rockchip/files.rk30xx
==============================================================================
--- stable/12/sys/arm/rockchip/files.rk30xx Mon Aug 5 18:05:22 2019
(r350602)
+++ stable/12/sys/arm/rockchip/files.rk30xx Mon Aug 5 18:13:13 2019
(r350603)
@@ -1,5 +1,4 @@
# $FreeBSD$
-kern/kern_clocksource.c standard
arm/rockchip/rk30xx_machdep.c standard
arm/rockchip/rk30xx_pmu.c standard
Modified: stable/12/sys/arm/samsung/exynos/files.exynos5
==============================================================================
--- stable/12/sys/arm/samsung/exynos/files.exynos5 Mon Aug 5 18:05:22
2019 (r350602)
+++ stable/12/sys/arm/samsung/exynos/files.exynos5 Mon Aug 5 18:13:13
2019 (r350603)
@@ -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
Modified: stable/12/sys/arm/ti/files.ti
==============================================================================
--- stable/12/sys/arm/ti/files.ti Mon Aug 5 18:05:22 2019
(r350602)
+++ stable/12/sys/arm/ti/files.ti Mon Aug 5 18:13:13 2019
(r350603)
@@ -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
Modified: stable/12/sys/arm/versatile/files.versatile
==============================================================================
--- stable/12/sys/arm/versatile/files.versatile Mon Aug 5 18:05:22 2019
(r350602)
+++ stable/12/sys/arm/versatile/files.versatile Mon Aug 5 18:13:13 2019
(r350603)
@@ -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
Modified: stable/12/sys/arm/xilinx/files.zynq7
==============================================================================
--- stable/12/sys/arm/xilinx/files.zynq7 Mon Aug 5 18:05:22 2019
(r350602)
+++ stable/12/sys/arm/xilinx/files.zynq7 Mon Aug 5 18:13:13 2019
(r350603)
@@ -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
Modified: stable/12/sys/conf/files.arm
==============================================================================
--- stable/12/sys/conf/files.arm Mon Aug 5 18:05:22 2019
(r350602)
+++ stable/12/sys/conf/files.arm Mon Aug 5 18:13:13 2019
(r350603)
@@ -1,23 +1,7 @@
# $FreeBSD$
-cloudabi32_vdso.o optional compat_cloudabi32 \
- dependency "$S/contrib/cloudabi/cloudabi_vdso_armv6.S" \
- compile-with "${CC} -x assembler-with-cpp -shared -nostdinc
-nostdlib -Wl,-T$S/compat/cloudabi/cloudabi_vdso.lds
$S/contrib/cloudabi/cloudabi_vdso_armv6.S -o ${.TARGET}" \
- no-obj no-implicit-rule \
- clean "cloudabi32_vdso.o"
-#
-cloudabi32_vdso_blob.o optional compat_cloudabi32 \
- dependency "cloudabi32_vdso.o" \
- compile-with "${OBJCOPY} --input-target binary --output-target
elf32-littlearm --binary-architecture arm cloudabi32_vdso.o ${.TARGET}" \
- no-implicit-rule \
- clean "cloudabi32_vdso_blob.o"
-#
-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
-arm/annapurna/alpine/alpine_pci_msix.c optional al_pci fdt
-arm/annapurna/alpine/alpine_serdes.c optional al_serdes fdt
\
- no-depend \
- compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal
-I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
+
+kern/kern_clocksource.c standard
+
arm/arm/autoconf.c standard
arm/arm/bcopy_page.S standard
arm/arm/bcopyinout.S standard
@@ -169,3 +153,26 @@ libkern/qdivrem.c standard
libkern/ucmpdi2.c standard
libkern/udivdi3.c standard
libkern/umoddi3.c standard
+
+# CloudABI support
+cloudabi32_vdso.o optional compat_cloudabi32 \
+ dependency "$S/contrib/cloudabi/cloudabi_vdso_armv6.S" \
+ compile-with "${CC} -x assembler-with-cpp -shared -nostdinc
-nostdlib -Wl,-T$S/compat/cloudabi/cloudabi_vdso.lds
$S/contrib/cloudabi/cloudabi_vdso_armv6.S -o ${.TARGET}" \
+ no-obj no-implicit-rule \
+ clean "cloudabi32_vdso.o"
+#
+cloudabi32_vdso_blob.o optional compat_cloudabi32 \
+ dependency "cloudabi32_vdso.o" \
+ compile-with "${OBJCOPY} --input-target binary --output-target
elf32-littlearm --binary-architecture arm cloudabi32_vdso.o ${.TARGET}" \
+ no-implicit-rule \
+ clean "cloudabi32_vdso_blob.o"
+#
+
+# Annapurna support
+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
+arm/annapurna/alpine/alpine_pci_msix.c optional al_pci fdt
+arm/annapurna/alpine/alpine_serdes.c optional al_serdes fdt
\
+ no-depend \
+ compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal
-I$S/contrib/alpine-hal/eth ${PROF} ${.IMPSRC}"
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
