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).

20 files changed, 16 insertions, 16 deletions

diff --git a/sys/arm/allwinner/common.c b/sys/arm/allwinner/a10_common.c
index 2aaa4511f412..2aaa4511f412 100644
--- a/sys/arm/allwinner/common.c
+++ b/sys/arm/allwinner/a10_common.c
diff --git a/sys/arm/allwinner/files.a10 b/sys/arm/allwinner/files.a10
index 0a584027755b..11def4f557c8 100644
--- a/sys/arm/allwinner/files.a10
+++ b/sys/arm/allwinner/files.a10
@@ -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
diff --git a/sys/arm/broadcom/bcm2835/common.c b/sys/arm/broadcom/bcm2835/bcm2835_common.c
index 5c3c2580cbe8..5c3c2580cbe8 100644
--- a/sys/arm/broadcom/bcm2835/common.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_common.c
diff --git a/sys/arm/broadcom/bcm2835/files.bcm2835 b/sys/arm/broadcom/bcm2835/files.bcm2835
index 1a905c472afe..4563b35909b4 100644
--- a/sys/arm/broadcom/bcm2835/files.bcm2835
+++ b/sys/arm/broadcom/bcm2835/files.bcm2835
@@ -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		optional sdhci
 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
diff --git a/sys/arm/freescale/imx/files.imx51 b/sys/arm/freescale/imx/files.imx51
index 4d028cfe69c8..2c6a154475bb 100644
--- a/sys/arm/freescale/imx/files.imx51
+++ b/sys/arm/freescale/imx/files.imx51
@@ -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
diff --git a/sys/arm/freescale/imx/files.imx53 b/sys/arm/freescale/imx/files.imx53
index f936ccc82123..6fb7b5d3da0e 100644
--- a/sys/arm/freescale/imx/files.imx53
+++ b/sys/arm/freescale/imx/files.imx53
@@ -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
diff --git a/sys/arm/freescale/imx/files.imx6 b/sys/arm/freescale/imx/files.imx6
index 1512b7c3e0c1..b08b4bd24d58 100644
--- a/sys/arm/freescale/imx/files.imx6
+++ b/sys/arm/freescale/imx/files.imx6
@@ -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
diff --git a/sys/arm/freescale/imx/common.c b/sys/arm/freescale/imx/imx_common.c
index d8fef824394e..d8fef824394e 100644
--- a/sys/arm/freescale/imx/common.c
+++ b/sys/arm/freescale/imx/imx_common.c
diff --git a/sys/arm/mv/files.mv b/sys/arm/mv/files.mv
index 116356d8a2dd..4fbdc6d17357 100644
--- a/sys/arm/mv/files.mv
+++ b/sys/arm/mv/files.mv
@@ -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
diff --git a/sys/arm/mv/common.c b/sys/arm/mv/mv_common.c
index 44c22cb20891..44c22cb20891 100644
--- a/sys/arm/mv/common.c
+++ b/sys/arm/mv/mv_common.c
diff --git a/sys/arm/rockchip/files.rk30xx b/sys/arm/rockchip/files.rk30xx
index dcb5d3f15791..ae9b68013192 100644
--- a/sys/arm/rockchip/files.rk30xx
+++ b/sys/arm/rockchip/files.rk30xx
@@ -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
diff --git a/sys/arm/rockchip/common.c b/sys/arm/rockchip/rk30xx_common.c
index 065318489a04..065318489a04 100644
--- a/sys/arm/rockchip/common.c
+++ b/sys/arm/rockchip/rk30xx_common.c
diff --git a/sys/arm/samsung/exynos/common.c b/sys/arm/samsung/exynos/exynos5_common.c
index 658efc417298..658efc417298 100644
--- a/sys/arm/samsung/exynos/common.c
+++ b/sys/arm/samsung/exynos/exynos5_common.c
diff --git a/sys/arm/samsung/exynos/files.exynos5 b/sys/arm/samsung/exynos/files.exynos5
index 1d90415e6c0c..bb8218e4c1f7 100644
--- a/sys/arm/samsung/exynos/files.exynos5
+++ b/sys/arm/samsung/exynos/files.exynos5
@@ -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
diff --git a/sys/arm/tegra/files.tegra2 b/sys/arm/tegra/files.tegra2
index 7f6e8937b5b8..de91f32fe886 100644
--- a/sys/arm/tegra/files.tegra2
+++ b/sys/arm/tegra/files.tegra2
@@ -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
diff --git a/sys/arm/tegra/common.c b/sys/arm/tegra/tegra2_common.c
index 868572dde33f..868572dde33f 100644
--- a/sys/arm/tegra/common.c
+++ b/sys/arm/tegra/tegra2_common.c
diff --git a/sys/arm/ti/files.ti b/sys/arm/ti/files.ti
index b2c964a4f883..510dbf982fd2 100644
--- a/sys/arm/ti/files.ti
+++ b/sys/arm/ti/files.ti
@@ -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
diff --git a/sys/arm/ti/common.c b/sys/arm/ti/ti_common.c
index 983e6f807617..983e6f807617 100644
--- a/sys/arm/ti/common.c
+++ b/sys/arm/ti/ti_common.c
diff --git a/sys/arm/versatile/files.versatile b/sys/arm/versatile/files.versatile
index 702a2366b574..ba892b362121 100644
--- a/sys/arm/versatile/files.versatile
+++ b/sys/arm/versatile/files.versatile
@@ -9,11 +9,11 @@ arm/arm/cpufunc_asm_armv6.S                     standard
 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
diff --git a/sys/arm/versatile/common.c b/sys/arm/versatile/versatile_common.c
index 766db9deacc5..766db9deacc5 100644
--- a/sys/arm/versatile/common.c
+++ b/sys/arm/versatile/versatile_common.c