[src/trunk]: src/sys/arch/evbarm/conf Split the two kernels to include only s...

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

details:   https://anonhg.NetBSD.org/src/rev/20779b236722
branches:  trunk
changeset: 332532:20779b236722
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Fri Sep 26 16:30:32 2014 +0000

description:
Split the two kernels to include only support for the device it describes

diffstat:

 sys/arch/evbarm/conf/ODROID-U  |  23 ++++++++++-------------
 sys/arch/evbarm/conf/ODROID-XU |  40 ++++++++++------------------------------
 2 files changed, 20 insertions(+), 43 deletions(-)

diffs (162 lines):

diff -r 10dcb0cba596 -r 20779b236722 sys/arch/evbarm/conf/ODROID-U
--- a/sys/arch/evbarm/conf/ODROID-U     Fri Sep 26 15:58:59 2014 +0000
+++ b/sys/arch/evbarm/conf/ODROID-U     Fri Sep 26 16:30:32 2014 +0000
@@ -1,7 +1,7 @@
 #
-#      $NetBSD: ODROID-U,v 1.15 2014/09/26 15:33:33 reinoud Exp $
+#      $NetBSD: ODROID-U,v 1.16 2014/09/26 16:30:32 reinoud Exp $
 #
-#      ODROID-U -- ODROID-U series Exynos Kernel
+#      ODROID-U -- ODROID-U{2,3} series Exynos4x12(P) based kernel
 #
 
 include        "arch/evbarm/conf/std.odroid"
@@ -18,19 +18,19 @@
 # CPU options
 options        CPU_CORTEX
 options        CPU_CORTEXA9
-options        EXYNOS4120
 options        EXYNOS4212
 options        EXYNOS4412
 options        EXYNOS4412P
 #options       MULTIPROCESSOR
+
 options        PMAPCOUNTERS
 options        BUSDMA_COUNTERS
 options        EXYNOS_CONSOLE_EARLY
-#options       UVMHIST
-#options       UVMHIST_PRINT,KERNHIST_DELAY=0
-#options       KERNHIST
-#options       USBHIST
-#options       USBHIST_SIZE=100000
+#options       UVMHIST
+#options       UVMHIST_PRINT,KERNHIST_DELAY=0
+#options       KERNHIST
+#options       USBHIST
+#options       USBHIST_SIZE=100000
 options        __HAVE_MM_MD_DIRECT_MAPPED_PHYS
 options        PMAP_NEED_ALLOC_POOLPAGE
 
@@ -161,6 +161,7 @@
 options UHUB_DEBUG
 options        USBVERBOSE
 
+
 # Valid options for BOOT_ARGS:
 #  single              Boot to single user only
 #  kdb                 Give control to kernel debugger
@@ -181,8 +182,8 @@
 
 # A9 core devices
 armperiph0     at mainbus?
+armgic0                at armperiph?                   # Interrupt Controller
 arml2cc0       at armperiph?                   # L2 Cache Controller
-armgic0                at armperiph?                   # Interrupt Controller
 
 # Exynos SoC
 exyo0          at mainbus?
@@ -215,11 +216,7 @@
 exyoiic0       at exyo0
 iic*           at exyoiic?
 
-
 # serial console connectivity
-# UARTS
-# sscom0 attached to expansion port
-# sscom1 is default serial UART console, enable for low-level console:
 options                SSCOM1CONSOLE, CONSPEED=115200
 
 # include all USB devices
diff -r 10dcb0cba596 -r 20779b236722 sys/arch/evbarm/conf/ODROID-XU
--- a/sys/arch/evbarm/conf/ODROID-XU    Fri Sep 26 15:58:59 2014 +0000
+++ b/sys/arch/evbarm/conf/ODROID-XU    Fri Sep 26 16:30:32 2014 +0000
@@ -1,7 +1,7 @@
 #
-#      $NetBSD: ODROID-XU,v 1.1 2014/09/26 15:33:58 reinoud Exp $
+#      $NetBSD: ODROID-XU,v 1.2 2014/09/26 16:30:32 reinoud Exp $
 #
-#      ODROID -- ODROID series Exynos Kernel
+#      ODROID-XU -- ODROID-XU Exynos5410 based kernel
 #
 
 include        "arch/evbarm/conf/std.odroid"
@@ -16,25 +16,18 @@
 #options       NTP             # NTP phase/frequency locked loop
 
 # CPU options
-#options       CPU_CORTEX
-#options       CPU_CORTEXA9
-#options       CPU_CORTEXA7
-#options       CPU_CORTEXA15
-#options       EXYNOS4120
-#options       EXYNOS4212
-#options       EXYNOS4412
-#options       EXYNOS4412P
-options        EXYNOS5260
+options        CPU_CORTEX
+options        CPU_CORTEXA7
+options        CPU_CORTEXA15
 options        EXYNOS5410
-options        EXYNOS5420
-options        EXYNOS5440
-options        EXYNOS5422
 #options       MULTIPROCESSOR
+
 options        PMAPCOUNTERS
 options        BUSDMA_COUNTERS
 options        EXYNOS_CONSOLE_EARLY
 #options       UVMHIST
-options                USBHIST
+options        USBHIST
+options        USBHIST_SIZE=100000
 #options       UVMHIST_PRINT,KERNHIST_DELAY=0
 options        __HAVE_MM_MD_DIRECT_MAPPED_PHYS
 options        PMAP_NEED_ALLOC_POOLPAGE
@@ -148,7 +141,7 @@
 #options       PERFCTRS        # performance counters
 options        DIAGNOSTIC      # internal consistency checks
 options        DEBUG
-#options       LOCKDEBUG
+options        LOCKDEBUG
 #options       PMAP_DEBUG      # Enable pmap_debug_level code
 #options       IPKDB           # remote kernel debugging
 options        VERBOSE_INIT_ARM # verbose bootstraping messages
@@ -188,22 +181,12 @@
 
 # A9 core devices
 armperiph0     at mainbus?
-ifdef EXYNOS4
-arml2cc0       at armperiph?                   # L2 Cache Controller
-endif
 armgic0                at armperiph?                   # Interrupt Controller
-#ifdef EXYNOS5
 armgtmr0       at armperiph?                   # Generic Timer
-#endif
 
 # Exynos SoC
 exyo0          at mainbus?
 
-# Integrated Samsung devices
-ifdef EXYNOS4
-mct0           at exyo0
-endif
-
 # Integrated Samsung UARTs
 #sscom*                at exyo0  port ?                # UART ?
 sscom2         at exyo0  port 2                # UART2
@@ -231,14 +214,11 @@
 
 # SATA
 #ahcisata*     at exyno0
-#atabus*               at ata?
+#atabus*       at ata?
 #wd*           at atabus? drive ?
 
 
 # serial console connectivity
-# UARTS
-# sscom0 is default serial UART console, enable for low-level console:
-# sscomX attached to expansion port
 options                SSCOM0CONSOLE, CONSPEED=115200
 
 # include all USB devices