[src/trunk]: src/sys/arch/arm/samsung Move everything back into files.exynos

[marty <marty%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3afe651fe3df
branches:  trunk
changeset: 342175:3afe651fe3df
user:      marty <marty%NetBSD.org@localhost>
date:      Fri Dec 11 03:55:18 2015 +0000

description:
Move everything back into files.exynos

diffstat:

 sys/arch/arm/samsung/files.exynos     |  14 +++++++++-----
 sys/arch/arm/samsung/files.exynos5422 |   8 --------
 2 files changed, 9 insertions(+), 13 deletions(-)

diffs (51 lines):

diff -r d64c02b00649 -r 3afe651fe3df sys/arch/arm/samsung/files.exynos
--- a/sys/arch/arm/samsung/files.exynos Fri Dec 11 01:15:00 2015 +0000
+++ b/sys/arch/arm/samsung/files.exynos Fri Dec 11 03:55:18 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.exynos,v 1.8 2015/12/05 13:32:27 jmcneill Exp $
+#      $NetBSD: files.exynos,v 1.9 2015/12/11 03:55:18 marty Exp $
 #
 # Configuration info for Samsung Exynos SoC ARM Peripherals
 #
@@ -15,7 +15,7 @@
 
 file   arch/arm/samsung/exynos_soc.c
 file   arch/arm/samsung/exynos_space.c
-file   arch/arm/samsung/exynos_dma.c
+#file  arch/arm/samsung/exynos_dma.c
 file   arch/arm/samsung/exynos_smc.S           arm_trustzone_firmware
 
 file   arch/arm/arm/bus_space_a4x.S            exyo
@@ -70,8 +70,8 @@
 defparam opt_sscom.h    SSCOM_FREQ 
 
 # GPIO
-device exyogpio : gpiobus
-attach exyogpio at exyo with exynos_gpio
+#device        exyogpio : gpiobus
+#attach        exyogpio at exyo with exynos_gpio
 file   arch/arm/samsung/exynos_gpio.c          exynos_gpio | exyo_io needs-flag
 
 # USB2 Host Controller (EHCI/OHCI)
@@ -86,4 +86,8 @@
 attach exyoiic at exyo with exynos_iic
 file   arch/arm/samsung/exynos_i2c.c           exynos_iic | exyo_io needs-flag
 
-include "arch/arm/samsung/files.exynos5422"
+file   arch/arm/samsung/exynos5422_dma.c
+
+device exy5422clk: clk
+attach exy5422clk at exyo with exynos5422_clock
+file   arch/arm/samsung/exynos5422_clock.c     exynos5422_clock
diff -r d64c02b00649 -r 3afe651fe3df sys/arch/arm/samsung/files.exynos5422
--- a/sys/arch/arm/samsung/files.exynos5422     Fri Dec 11 01:15:00 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#      $NetBSD: files.exynos5422,v 1.1 2015/12/05 13:32:27 jmcneill Exp $
-#
-# Configuration info for Samsung Exynos 5422
-#
-
-device exy5422clk: clk
-attach exy5422clk at exyo with exynos5422_clock
-file   arch/arm/samsung/exynos5422_clock.c     exynos5422_clock