[src/trunk]: src/sys/arch/evbarm/conf Merge EXYNOS into GENERIC completely. ...

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

details:   https://anonhg.NetBSD.org/src/rev/7c48d61e3cb0
branches:  trunk
changeset: 836666:7c48d61e3cb0
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Oct 30 06:55:07 2018 +0000

description:
Merge EXYNOS into GENERIC completely.  GENERIC nows boots on ODROID-XU4

diffstat:

 sys/arch/evbarm/conf/GENERIC |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r 93be2e4a5d28 -r 7c48d61e3cb0 sys/arch/evbarm/conf/GENERIC
--- a/sys/arch/evbarm/conf/GENERIC      Tue Oct 30 05:56:02 2018 +0000
+++ b/sys/arch/evbarm/conf/GENERIC      Tue Oct 30 06:55:07 2018 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC,v 1.9 2018/10/18 09:01:53 skrll Exp $
+#      $NetBSD: GENERIC,v 1.10 2018/10/30 06:55:07 skrll Exp $
 #
 #      GENERIC ARM (aarch32) kernel
 #
@@ -20,9 +20,9 @@
        bcm2837-rpi-3-b.dts
        bcm2837-rpi-3-b-plus.dts
 
-       exynos4412-odroidx2.dts
+       exynos4412-odroidu3.dts
        exynos4412-odroidx.dts
-       exynos4412-odroidu3.dts
+       exynos4412-odroidx2.dts
        exynos5410-odroidxu.dts
        exynos5410-smdk5410.dts
        exynos5422-odroidxu3-lite.dts
@@ -251,10 +251,14 @@
 # SRAM controller
 sunxisramc*     at fdt? pass 4          # SRAM controller
 
+# System Controller
+syscon*                at fdt? pass 1          # Generic System Controller
+
 # Timer
 gtmr*          at fdt? pass 1          # ARM Generic Timer
 armgtmr0       at gtmr?
 mct*           at fdt? pass 2          # Exynos Multi Core Timer (MCT)
+armgtmr*       at mct?
 sunxitimer*     at fdt?                 # Allwinner async timer
 tegratimer*    at fdt?                 # Timers
 
@@ -509,6 +513,7 @@
 ehci*          at fdt?                 # EHCI
 #motg*         at fdt?                 # Mentor Graphics USB OTG
 ohci*          at fdt?                 # OHCI
+ehci*          at fdt?                 # EHCI
 xhci*          at fdt?                 # XHCI
 usb*           at usbus?
 
@@ -521,7 +526,6 @@
 viornd* at virtio?                     # Virtio entropy device
 vioscsi* at virtio?                    # Virtio SCSI device
 
-
 include "dev/usb/usbdevices.config"
 midi*          at midibus?