Date: Sat, 8 Mar 2014 00:14:40 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r262916 - in head/sys/arm: allwinner broadcom/bcm2835 freescale/imx mv rockchip samsung/exynos tegra ti versatile Message-ID: <201403080014.s280EeXV027966@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sat Mar 8 00:14:40 2014 New Revision: 262916 URL: http://svnweb.freebsd.org/changeset/base/262916 Log: Move all the files named foo/common.c to foo/foo_common.c, as appropriate for each of the 'foo' in the tree. This will allow us to compile them together (although symbol conflicts prevent us from doing that today, this just fixes the file name collision). Added: head/sys/arm/allwinner/a10_common.c - copied, changed from r262912, head/sys/arm/allwinner/common.c head/sys/arm/broadcom/bcm2835/bcm2835_common.c - copied, changed from r262912, head/sys/arm/broadcom/bcm2835/common.c head/sys/arm/freescale/imx/imx_common.c - copied, changed from r262912, head/sys/arm/freescale/imx/common.c head/sys/arm/mv/mv_common.c - copied, changed from r262912, head/sys/arm/mv/common.c head/sys/arm/rockchip/rk30xx_common.c - copied, changed from r262912, head/sys/arm/rockchip/common.c head/sys/arm/samsung/exynos/exynos5_common.c - copied, changed from r262912, head/sys/arm/samsung/exynos/common.c head/sys/arm/tegra/tegra2_common.c - copied, changed from r262912, head/sys/arm/tegra/common.c head/sys/arm/ti/ti_common.c - copied, changed from r262912, head/sys/arm/ti/common.c head/sys/arm/versatile/versatile_common.c - copied, changed from r262912, head/sys/arm/versatile/common.c Deleted: head/sys/arm/allwinner/common.c head/sys/arm/broadcom/bcm2835/common.c head/sys/arm/freescale/imx/common.c head/sys/arm/mv/common.c head/sys/arm/rockchip/common.c head/sys/arm/samsung/exynos/common.c head/sys/arm/tegra/common.c head/sys/arm/ti/common.c head/sys/arm/versatile/common.c Modified: head/sys/arm/allwinner/files.a10 head/sys/arm/broadcom/bcm2835/files.bcm2835 head/sys/arm/freescale/imx/files.imx51 head/sys/arm/freescale/imx/files.imx53 head/sys/arm/freescale/imx/files.imx6 head/sys/arm/mv/files.mv head/sys/arm/rockchip/files.rk30xx head/sys/arm/samsung/exynos/files.exynos5 head/sys/arm/tegra/files.tegra2 head/sys/arm/ti/files.ti head/sys/arm/versatile/files.versatile Copied and modified: head/sys/arm/allwinner/a10_common.c (from r262912, head/sys/arm/allwinner/common.c) ============================================================================== Modified: head/sys/arm/allwinner/files.a10 ============================================================================== --- head/sys/arm/allwinner/files.a10 Fri Mar 7 23:40:36 2014 (r262915) +++ head/sys/arm/allwinner/files.a10 Sat Mar 8 00:14:40 2014 (r262916) @@ -9,16 +9,16 @@ arm/arm/cpufunc_asm_arm11.S standard arm/arm/cpufunc_asm_armv7.S standard arm/arm/irq_dispatch.S standard -arm/allwinner/a20/a20_cpu_cfg.c standard arm/allwinner/a10_clk.c standard -arm/allwinner/a10_sramc.c standard +arm/allwinner/a10_common.c standard arm/allwinner/a10_gpio.c optional gpio arm/allwinner/a10_ehci.c optional ehci -arm/allwinner/if_emac.c optional emac +arm/allwinner/a10_machdep.c standard +arm/allwinner/a10_sramc.c standard arm/allwinner/a10_wdog.c standard -arm/allwinner/timer.c standard +arm/allwinner/a20/a20_cpu_cfg.c standard arm/allwinner/aintc.c standard +arm/allwinner/if_emac.c optional emac +arm/allwinner/timer.c standard arm/arm/bus_space-v6.c standard -arm/allwinner/common.c standard #arm/allwinner/console.c standard -arm/allwinner/a10_machdep.c standard Copied and modified: head/sys/arm/broadcom/bcm2835/bcm2835_common.c (from r262912, head/sys/arm/broadcom/bcm2835/common.c) ============================================================================== Modified: head/sys/arm/broadcom/bcm2835/files.bcm2835 ============================================================================== --- head/sys/arm/broadcom/bcm2835/files.bcm2835 Fri Mar 7 23:40:36 2014 (r262915) +++ head/sys/arm/broadcom/bcm2835/files.bcm2835 Sat Mar 8 00:14:40 2014 (r262916) @@ -1,6 +1,7 @@ # $FreeBSD$ arm/broadcom/bcm2835/bcm2835_bsc.c optional bcm2835_bsc +arm/broadcom/bcm2835/bcm2835_common.c optional fdt arm/broadcom/bcm2835/bcm2835_dma.c standard arm/broadcom/bcm2835/bcm2835_fb.c optional sc arm/broadcom/bcm2835/bcm2835_fbd.c optional vt @@ -12,7 +13,6 @@ arm/broadcom/bcm2835/bcm2835_sdhci.c op arm/broadcom/bcm2835/bcm2835_spi.c optional bcm2835_spi arm/broadcom/bcm2835/bcm2835_systimer.c standard arm/broadcom/bcm2835/bcm2835_wdog.c standard -arm/broadcom/bcm2835/common.c optional fdt dev/usb/controller/dwc_otg_fdt.c optional dwcotg arm/arm/bus_space-v6.c standard Modified: head/sys/arm/freescale/imx/files.imx51 ============================================================================== --- head/sys/arm/freescale/imx/files.imx51 Fri Mar 7 23:40:36 2014 (r262915) +++ head/sys/arm/freescale/imx/files.imx51 Sat Mar 8 00:14:40 2014 (r262916) @@ -8,9 +8,9 @@ arm/arm/irq_dispatch.S standard kern/kern_clocksource.c standard # Init +arm/freescale/imx/imx_common.c standard arm/freescale/imx/imx_machdep.c standard arm/freescale/imx/imx51_machdep.c standard -arm/freescale/imx/common.c standard arm/arm/bus_space-v6.c standard # Dummy serial console Modified: head/sys/arm/freescale/imx/files.imx53 ============================================================================== --- head/sys/arm/freescale/imx/files.imx53 Fri Mar 7 23:40:36 2014 (r262915) +++ head/sys/arm/freescale/imx/files.imx53 Sat Mar 8 00:14:40 2014 (r262916) @@ -8,9 +8,9 @@ arm/arm/irq_dispatch.S standard kern/kern_clocksource.c standard # Init +arm/freescale/imx/imx_common.c standard arm/freescale/imx/imx_machdep.c standard arm/freescale/imx/imx53_machdep.c standard -arm/freescale/imx/common.c standard arm/arm/bus_space-v6.c standard # Special serial console for debuging early boot code Modified: head/sys/arm/freescale/imx/files.imx6 ============================================================================== --- head/sys/arm/freescale/imx/files.imx6 Fri Mar 7 23:40:36 2014 (r262915) +++ head/sys/arm/freescale/imx/files.imx6 Sat Mar 8 00:14:40 2014 (r262916) @@ -18,8 +18,8 @@ arm/arm/gic.c standard arm/arm/pl310.c standard arm/arm/bus_space-v6.c standard arm/freescale/fsl_ocotp.c standard -arm/freescale/imx/common.c standard arm/freescale/imx/imx6_anatop.c standard +arm/freescale/imx/imx_common.c standard arm/freescale/imx/imx6_ccm.c standard arm/freescale/imx/imx6_machdep.c standard arm/freescale/imx/imx6_mp.c optional smp Copied and modified: head/sys/arm/freescale/imx/imx_common.c (from r262912, head/sys/arm/freescale/imx/common.c) ============================================================================== Modified: head/sys/arm/mv/files.mv ============================================================================== --- head/sys/arm/mv/files.mv Fri Mar 7 23:40:36 2014 (r262915) +++ head/sys/arm/mv/files.mv Sat Mar 8 00:14:40 2014 (r262916) @@ -23,8 +23,8 @@ arm/arm/cpufunc_asm_pj4b.S standard arm/arm/irq_dispatch.S standard arm/mv/bus_space.c standard -arm/mv/common.c standard arm/mv/gpio.c standard +arm/mv/mv_common.c standard arm/mv/mv_localbus.c standard arm/mv/mv_machdep.c standard arm/mv/mv_pci.c optional pci Copied and modified: head/sys/arm/mv/mv_common.c (from r262912, head/sys/arm/mv/common.c) ============================================================================== Modified: head/sys/arm/rockchip/files.rk30xx ============================================================================== --- head/sys/arm/rockchip/files.rk30xx Fri Mar 7 23:40:36 2014 (r262915) +++ head/sys/arm/rockchip/files.rk30xx Sat Mar 8 00:14:40 2014 (r262916) @@ -13,7 +13,7 @@ arm/arm/gic.c standard arm/arm/mpcore_timer.c standard arm/arm/bus_space-v6.c standard -arm/rockchip/common.c standard +arm/rockchip/rk30xx_common.c standard arm/rockchip/rk30xx_machdep.c standard arm/rockchip/rk30xx_pmu.c standard arm/rockchip/rk30xx_grf.c standard Copied and modified: head/sys/arm/rockchip/rk30xx_common.c (from r262912, head/sys/arm/rockchip/common.c) ============================================================================== Copied and modified: head/sys/arm/samsung/exynos/exynos5_common.c (from r262912, head/sys/arm/samsung/exynos/common.c) ============================================================================== Modified: head/sys/arm/samsung/exynos/files.exynos5 ============================================================================== --- head/sys/arm/samsung/exynos/files.exynos5 Fri Mar 7 23:40:36 2014 (r262915) +++ head/sys/arm/samsung/exynos/files.exynos5 Sat Mar 8 00:14:40 2014 (r262916) @@ -16,7 +16,7 @@ arm/arm/generic_timer.c standard arm/samsung/exynos/arch_timer.c standard arm/samsung/exynos/exynos5_mp.c optional smp -arm/samsung/exynos/common.c standard +arm/samsung/exynos/exynos5_common.c standard arm/samsung/exynos/exynos5_machdep.c standard arm/samsung/exynos/uart.c optional uart arm/samsung/exynos/ehci_exynos5.c optional ehci Modified: head/sys/arm/tegra/files.tegra2 ============================================================================== --- head/sys/arm/tegra/files.tegra2 Fri Mar 7 23:40:36 2014 (r262915) +++ head/sys/arm/tegra/files.tegra2 Sat Mar 8 00:14:40 2014 (r262916) @@ -11,7 +11,7 @@ arm/arm/irq_dispatch.S standard arm/arm/gic.c standard arm/arm/mpcore_timer.c standard -arm/tegra/common.c standard +arm/tegra/tegra2_common.c standard arm/tegra/tegra2_machdep.c standard kern/kern_clocksource.c standard Copied and modified: head/sys/arm/tegra/tegra2_common.c (from r262912, head/sys/arm/tegra/common.c) ============================================================================== Modified: head/sys/arm/ti/files.ti ============================================================================== --- head/sys/arm/ti/files.ti Fri Mar 7 23:40:36 2014 (r262915) +++ head/sys/arm/ti/files.ti Sat Mar 8 00:14:40 2014 (r262916) @@ -11,7 +11,7 @@ arm/arm/cpufunc_asm_arm11.S standard arm/arm/cpufunc_asm_armv7.S standard arm/arm/irq_dispatch.S standard -arm/ti/common.c standard +arm/ti/ti_common.c standard arm/ti/ti_cpuid.c standard arm/ti/ti_machdep.c standard arm/ti/ti_prcm.c standard Copied and modified: head/sys/arm/ti/ti_common.c (from r262912, head/sys/arm/ti/common.c) ============================================================================== Modified: head/sys/arm/versatile/files.versatile ============================================================================== --- head/sys/arm/versatile/files.versatile Fri Mar 7 23:40:36 2014 (r262915) +++ head/sys/arm/versatile/files.versatile Sat Mar 8 00:14:40 2014 (r262916) @@ -9,11 +9,11 @@ arm/arm/cpufunc_asm_armv6.S arm/arm/irq_dispatch.S standard arm/versatile/bus_space.c standard -arm/versatile/common.c standard arm/versatile/pl050.c optional sc arm/versatile/sp804.c standard arm/versatile/versatile_machdep.c standard arm/versatile/versatile_clcd.c optional sc +arm/versatile/versatile_common.c standard arm/versatile/versatile_pci.c optional pci arm/versatile/versatile_pci_bus_space.c optional pci arm/versatile/versatile_sic.c standard Copied and modified: head/sys/arm/versatile/versatile_common.c (from r262912, head/sys/arm/versatile/common.c) ==============================================================================
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403080014.s280EeXV027966>