Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/evbarm/conf Move common non-device stuff to GENERIC...



details:   https://anonhg.NetBSD.org/src/rev/8b2cd9783202
branches:  trunk
changeset: 807275:8b2cd9783202
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Apr 03 23:25:07 2015 +0000

description:
Move common non-device stuff to GENERIC.common. Simplify board configs,
and let them all share common settings.

diffstat:

 sys/arch/evbarm/conf/ALLWINNER_A80   |  189 +---------------------------------
 sys/arch/evbarm/conf/GENERIC.common  |  162 ++++++++++++++++++++++++++++++
 sys/arch/evbarm/conf/HUMMINGBIRD_A31 |  188 +---------------------------------
 sys/arch/evbarm/conf/JETSONTK1       |  165 +-----------------------------
 sys/arch/evbarm/conf/ODROID-C1       |  181 +--------------------------------
 sys/arch/evbarm/conf/ROCKCHIP        |  178 +--------------------------------
 6 files changed, 191 insertions(+), 872 deletions(-)

diffs (truncated from 1279 to 300 lines):

diff -r 0097f758afbb -r 8b2cd9783202 sys/arch/evbarm/conf/ALLWINNER_A80
--- a/sys/arch/evbarm/conf/ALLWINNER_A80        Fri Apr 03 21:40:04 2015 +0000
+++ b/sys/arch/evbarm/conf/ALLWINNER_A80        Fri Apr 03 23:25:07 2015 +0000
@@ -1,22 +1,10 @@
-#      $NetBSD: ALLWINNER_A80,v 1.14 2014/12/21 17:42:12 jmcneill Exp $
+#      $NetBSD: ALLWINNER_A80,v 1.15 2015/04/03 23:25:07 jmcneill Exp $
 #
 #      ALLWINNER_A80 - Allwinner A80 boards (Cubieboard4, OptimusBoard, etc)
 #
 
 include        "arch/evbarm/conf/std.awin"
-
-#options       VERBOSE_INIT_ARM
-
-# estimated number of users
-
-maxusers       32
-
-# Standard system options
-
-options        RTC_OFFSET=0    # hardware clock is this many mins. west of GMT
-#options       NTP             # NTP phase/frequency locked loop
-
-# CPU options
+include        "arch/evbarm/conf/GENERIC.common"
 
 no makeoptions CPUFLAGS
 makeoptions    CPUFLAGS="-mcpu=cortex-a7 -mfpu=neon"
@@ -27,165 +15,25 @@
 makeoptions    KERNEL_BASE_PHYS="0x80000000"
 makeoptions    KERNEL_BASE_VIRT="0x80000000"
 options        PMAP_NEED_ALLOC_POOLPAGE
-#options       UVMHIST,UVMHIST_PRINT
+
 options        CPU_CORTEXA7
 options        ALLWINNER_A80
-options        PMAPCOUNTERS
+options        MULTIPROCESSOR
+options        MEMSIZE=2048
 options        AWIN_CONSOLE_EARLY
 options        AWIN_GPIO_IGNORE_FW
 
-# Architecture options
-
-# File systems
-
-file-system    FFS             # UFS
-#file-system   LFS             # log-structured file system
-file-system    MFS             # memory file system
-file-system    NFS             # Network file system
-#file-system   ADOSFS          # AmigaDOS-compatible file system
-#file-system   EXT2FS          # second extended file system (linux)
-#file-system   CD9660          # ISO 9660 + Rock Ridge file system
-file-system    MSDOSFS         # MS-DOS file system
-#file-system   FDESC           # /dev/fd
-file-system    KERNFS          # /kern
-#file-system   NULLFS          # loopback file system
-file-system    PROCFS          # /proc
-#file-system   PUFFS           # Userspace file systems (e.g. ntfs-3g & sshfs)
-#file-system   UMAPFS          # NULLFS + uid and gid remapping
-#file-system   UNION           # union file system
-file-system    TMPFS           # memory file system
-file-system    PTYFS           # /dev/pts/N support
-
-# File system options
-#options       QUOTA           # legacy UFS quotas
-#options       QUOTA2          # new, in-filesystem UFS quotas
-#options       FFS_EI          # FFS Endian Independent support
-#options       NFSSERVER
-options        WAPBL           # File system journaling support
-#options       FFS_NO_SNAPSHOT # No FFS snapshot support
-
-# Networking options
-
-#options       GATEWAY         # packet forwarding
-options        INET            # IP + ICMP + TCP + UDP
-options        INET6           # IPV6
-#options       IPSEC           # IP security
-#options       IPSEC_DEBUG     # debug for IP security
-#options       MROUTING        # IP multicast routing
-#options       PIM             # Protocol Independent Multicast
-#options       NETATALK        # AppleTalk networking
-#options       PPP_BSDCOMP     # BSD-Compress compression support for PPP
-#options       PPP_DEFLATE     # Deflate compression support for PPP
-#options       PPP_FILTER      # Active filter support for PPP (requires bpf)
-#options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
-
-options        NFS_BOOT_BOOTP
-options        NFS_BOOT_DHCP
-#options               NFS_BOOT_BOOTSTATIC
-#options               NFS_BOOTSTATIC_MYIP="\"192.168.1.4\""
-#options               NFS_BOOTSTATIC_GWIP="\"192.168.1.1\""
-#options               NFS_BOOTSTATIC_MASK="\"255.255.255.0\""
-#options               NFS_BOOTSTATIC_SERVADDR="\"192.168.1.1\""
-#options               NFS_BOOTSTATIC_SERVER="\"192.168.1.1:/nfs/sdp2430\""
-
-options                NFS_BOOT_RWSIZE=1024
-
-# Compatibility options
-
-options                COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-#options       COMPAT_43       # 4.3BSD compatibility.
-#options       COMPAT_09       # NetBSD 0.9,
-#options       COMPAT_10       # NetBSD 1.0,
-#options       COMPAT_11       # NetBSD 1.1,
-#options       COMPAT_12       # NetBSD 1.2,
-#options       COMPAT_13       # NetBSD 1.3,
-#options       COMPAT_14       # NetBSD 1.4,
-#options       COMPAT_15       # NetBSD 1.5,
-#options       COMPAT_16       # NetBSD 1.6,
-#options       COMPAT_20       # NetBSD 2.0,
-options        COMPAT_30       # NetBSD 3.0,
-options        COMPAT_40       # NetBSD 4.0,
-options        COMPAT_50       # NetBSD 5.0,
-options        COMPAT_60       # NetBSD 6.0, and
-options        COMPAT_70       # NetBSD 7.0 binary compatibility.
-#options       TCP_COMPAT_42   # 4.2BSD TCP/IP bug compat. Not recommended.
-#options               COMPAT_BSDPTY   # /dev/[pt]ty?? ptys.
-
-# Shared memory options
-
-options        SYSVMSG         # System V-like message queues
-options        SYSVSEM         # System V-like semaphores
-options        SYSVSHM         # System V-like memory sharing
-
-# Device options
-
-#options       MEMORY_DISK_HOOKS       # boottime setup of ramdisk
-#options       MEMORY_DISK_ROOT_SIZE=8192      # Size in blocks
-#options       MEMORY_DISK_DYNAMIC
-#options       MINIROOTSIZE=1000       # Size in blocks
-#options       MEMORY_DISK_IS_ROOT     # use memory disk as root
-
-# Wedge support
-options        DKWEDGE_AUTODISCOVER    # Automatically add dk(4) instances
-options        DKWEDGE_METHOD_GPT      # Supports GPT partitions as wedges
-
-# Miscellaneous kernel options
-options        KTRACE          # system call tracing, a la ktrace(1)
-#options       KMEMSTATS       # kernel memory statistics
-#options       SCSIVERBOSE     # Verbose SCSI errors
-#options       MIIVERBOSE      # Verbose MII autoconfuration messages
-#options       DDB_KEYCODE=0x40
-#options       USERCONF        # userconf(4) support
-#options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-
-# Alternate buffer queue strategies for better responsiveness under high
-# disk I/O load.
-#options       BUFQ_READPRIO
-options        BUFQ_PRIOCSCAN
-
-# Development and Debugging options
-
-#options       PERFCTRS        # performance counters
 options        DIAGNOSTIC      # internal consistency checks
 #options       DEBUG
-#options       PMAP_DEBUG      # Enable pmap_debug_level code
-#options       IPKDB           # remote kernel debugging
 #options       VERBOSE_INIT_ARM # verbose bootstraping messages
-options        DDB             # in-kernel debugger
-options                DDB_ONPANIC=1
-options        DDB_HISTORY_SIZE=100    # Enable history editing in DDB
-#options       KGDB
 makeoptions    DEBUG="-g"      # compile full symbol table
 makeoptions    COPY_SYMTAB=1
 
-## USB Debugging options
-options USB_DEBUG
-options EHCI_DEBUG
-options OHCI_DEBUG
-options UHUB_DEBUG
-
-
-# Valid options for BOOT_ARGS:
-#  single              Boot to single user only
-#  kdb                 Give control to kernel debugger
-#  ask                 Ask for file name to reboot from
-#  memorydisk=<n>      Set memorydisk size to <n> KB
-#  quiet               Show aprint_naive output
-#  verbose             Show aprint_normal and aprint_verbose output
-options                BOOT_ARGS="\"\""
-
 config         netbsd          root on ? type ?
 
-# The main bus device
 mainbus0       at root
-
-# CPU
-options        MULTIPROCESSOR
 cpu*           at mainbus?
 
-# Specify the memory size in megabytes.
-options        MEMSIZE=2048
-
 # A7 core devices
 armperiph0     at mainbus?
 armgic0                at armperiph?                           # Interrupt Controller
@@ -275,6 +123,8 @@
 options        WSDISPLAY_COMPAT_USL
 options        WSDISPLAY_COMPAT_RAWKBD
 options        WSDISPLAY_DEFAULTSCREENS=4
+pseudo-device  wsmux
+pseudo-device  wsfont
 
 # On-board USB
 awinusb0       at awinio0 port 0
@@ -297,29 +147,4 @@
 rgephy*        at mii? phy ?
 ukphy*         at mii? phy ?
 
-# Pseudo-Devices
-
-# disk/mass storage pseudo-devices
-#pseudo-device md                      # memory disk device (ramdisk)
-#pseudo-device vnd                     # disk-like interface to files
-#pseudo-device fss                     # file system snapshot device
-#pseudo-device putter                  # for puffs and pud
-pseudo-device  drvctl                  # driver control
-
-# network pseudo-devices
-pseudo-device  bpfilter                # Berkeley packet filter
-pseudo-device  loop                    # network loopback
-#pseudo-device kttcp                   # network loopback
-
-# miscellaneous pseudo-devices
-pseudo-device  pty                     # pseudo-terminals
-#options       RND_COM
-#pseudo-device clockctl                # user control of clock subsystem
-pseudo-device  ksyms                   # /dev/ksyms
-pseudo-device  lockstat                # lock profiling
-
-# wscons pseudo-devices
-pseudo-device  wsmux                   # mouse & keyboard mux
-pseudo-device  wsfont
-
 cinclude "arch/evbarm/conf/ALLWINNER_A80.local"
diff -r 0097f758afbb -r 8b2cd9783202 sys/arch/evbarm/conf/GENERIC.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbarm/conf/GENERIC.common       Fri Apr 03 23:25:07 2015 +0000
@@ -0,0 +1,162 @@
+#
+#      $NetBSD: GENERIC.common,v 1.1 2015/04/03 23:25:07 jmcneill Exp $
+#
+#      GENERIC evbarm kernel config (template)
+#
+
+# estimated number of users
+
+maxusers       32
+
+# Standard system options
+
+options        RTC_OFFSET=0    # hardware clock is this many mins. west of GMT
+#options       NTP             # NTP phase/frequency locked loop
+
+# CPU options
+options        PMAPCOUNTERS
+
+# Architecture options
+
+# File systems
+
+file-system    FFS             # UFS
+#file-system   LFS             # log-structured file system
+file-system    MFS             # memory file system
+file-system    NFS             # Network file system
+#file-system   ADOSFS          # AmigaDOS-compatible file system
+#file-system   EXT2FS          # second extended file system (linux)
+#file-system   CD9660          # ISO 9660 + Rock Ridge file system
+file-system    MSDOSFS         # MS-DOS file system
+#file-system   FDESC           # /dev/fd
+file-system    KERNFS          # /kern
+#file-system   NULLFS          # loopback file system
+file-system    PROCFS          # /proc
+#file-system   PUFFS           # Userspace file systems (e.g. ntfs-3g & sshfs)
+#file-system   UMAPFS          # NULLFS + uid and gid remapping
+#file-system   UNION           # union file system
+file-system    TMPFS           # memory file system
+file-system    PTYFS           # /dev/pts/N support
+
+# File system options
+#options       QUOTA           # legacy UFS quotas
+#options       QUOTA2          # new, in-filesystem UFS quotas
+#options       FFS_EI          # FFS Endian Independent support
+#options       NFSSERVER
+options        WAPBL           # File system journaling support
+#options       FFS_NO_SNAPSHOT # No FFS snapshot support
+
+# Networking options
+
+#options       GATEWAY         # packet forwarding
+options        INET            # IP + ICMP + TCP + UDP
+options        INET6           # IPV6
+#options       IPSEC           # IP security
+#options       IPSEC_DEBUG     # debug for IP security
+#options       MROUTING        # IP multicast routing
+#options       PIM             # Protocol Independent Multicast
+#options       NETATALK        # AppleTalk networking
+#options       PPP_BSDCOMP     # BSD-Compress compression support for PPP
+#options       PPP_DEFLATE     # Deflate compression support for PPP



Home | Main Index | Thread Index | Old Index