Module Name: src
Committed By: matt
Date: Sun Apr 19 21:28:38 UTC 2015
Modified Files:
src/sys/arch/evbarm/conf: ALLWINNER_A80 CUBIEBOARD CUBIEBOARD_INSTALL
CUBIETRUCK
Log Message:
Remove options CPU_CORTEX* since options ALLWINNER_* will now define them.
Use GENERIC.common for CUBIEBOARD (and BPI and CUBIETRUCK)
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/ALLWINNER_A80
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/CUBIEBOARD
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/CUBIEBOARD_INSTALL
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/CUBIETRUCK
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/ALLWINNER_A80
diff -u src/sys/arch/evbarm/conf/ALLWINNER_A80:1.15 src/sys/arch/evbarm/conf/ALLWINNER_A80:1.16
--- src/sys/arch/evbarm/conf/ALLWINNER_A80:1.15 Fri Apr 3 23:25:07 2015
+++ src/sys/arch/evbarm/conf/ALLWINNER_A80 Sun Apr 19 21:28:37 2015
@@ -1,4 +1,4 @@
-# $NetBSD: ALLWINNER_A80,v 1.15 2015/04/03 23:25:07 jmcneill Exp $
+# $NetBSD: ALLWINNER_A80,v 1.16 2015/04/19 21:28:37 matt Exp $
#
# ALLWINNER_A80 - Allwinner A80 boards (Cubieboard4, OptimusBoard, etc)
#
@@ -16,7 +16,6 @@ makeoptions KERNEL_BASE_PHYS="0x8000000
makeoptions KERNEL_BASE_VIRT="0x80000000"
options PMAP_NEED_ALLOC_POOLPAGE
-options CPU_CORTEXA7
options ALLWINNER_A80
options MULTIPROCESSOR
options MEMSIZE=2048
Index: src/sys/arch/evbarm/conf/CUBIEBOARD
diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.38 src/sys/arch/evbarm/conf/CUBIEBOARD:1.39
--- src/sys/arch/evbarm/conf/CUBIEBOARD:1.38 Fri Feb 13 13:48:17 2015
+++ src/sys/arch/evbarm/conf/CUBIEBOARD Sun Apr 19 21:28:37 2015
@@ -1,162 +1,27 @@
#
-# $NetBSD: CUBIEBOARD,v 1.38 2015/02/13 13:48:17 joerg Exp $
+# $NetBSD: CUBIEBOARD,v 1.39 2015/04/19 21:28:37 matt Exp $
#
# CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel
#
include "arch/evbarm/conf/std.awin"
-# 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
no makeoptions BOARDTYPE
makeoptions BOARDTYPE="cubieboard"
#options UVMHIST,UVMHIST_PRINT
-options CPU_CORTEXA8
-options CPU_CORTEXA7
options ALLWINNER_A10
options ALLWINNER_A20
-options PMAPCOUNTERS
options AWIN_CONSOLE_EARLY
-# 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
+include "arch/evbarm/conf/GENERIC.common"
## USB Debugging options
-options USB_DEBUG
-options EHCI_DEBUG
-options OHCI_DEBUG
-options UHUB_DEBUG
-
+options USB_DEBUG
+options EHCI_DEBUG
+options OHCI_DEBUG
+options UHUB_DEBUG
# Valid options for BOOT_ARGS:
# single Boot to single user only
@@ -174,6 +39,7 @@ mainbus0 at root
# CPU(s)
options MULTIPROCESSOR
+options __HAVE_PREEMPTION
cpu* at mainbus?
# Specify the memory size in megabytes (optional).
@@ -313,26 +179,4 @@ rlphy* at mii? phy ?
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
-options VND_COMPRESSION # compressed vnd(4)
-#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
-
cinclude "arch/evbarm/conf/CUBIEBOARD.local"
Index: src/sys/arch/evbarm/conf/CUBIEBOARD_INSTALL
diff -u src/sys/arch/evbarm/conf/CUBIEBOARD_INSTALL:1.2 src/sys/arch/evbarm/conf/CUBIEBOARD_INSTALL:1.3
--- src/sys/arch/evbarm/conf/CUBIEBOARD_INSTALL:1.2 Thu May 1 18:43:45 2014
+++ src/sys/arch/evbarm/conf/CUBIEBOARD_INSTALL Sun Apr 19 21:28:37 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CUBIEBOARD_INSTALL,v 1.2 2014/05/01 18:43:45 martin Exp $
+# $NetBSD: CUBIEBOARD_INSTALL,v 1.3 2015/04/19 21:28:37 matt Exp $
#
# CUBIEBOARD_INSTALL -- CUBIEBOARD kernel with installation-sized
# ramdisk
@@ -8,4 +8,3 @@ include "arch/evbarm/conf/CUBIEBOARD"
include "arch/evbarm/conf/INSTALL"
options BOOTHOWTO=RB_SINGLE
-no makeoptions DEBUG
Index: src/sys/arch/evbarm/conf/CUBIETRUCK
diff -u src/sys/arch/evbarm/conf/CUBIETRUCK:1.6 src/sys/arch/evbarm/conf/CUBIETRUCK:1.7
--- src/sys/arch/evbarm/conf/CUBIETRUCK:1.6 Wed Nov 5 20:34:38 2014
+++ src/sys/arch/evbarm/conf/CUBIETRUCK Sun Apr 19 21:28:37 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CUBIETRUCK,v 1.6 2014/11/05 20:34:38 martin Exp $
+# $NetBSD: CUBIETRUCK,v 1.7 2015/04/19 21:28:37 matt Exp $
#
# CUBIETRUCK - Cubieboard3 (mostly cubieboard2 with 2GB)
#
@@ -19,7 +19,6 @@ makeoptions BOARDTYPE="cubietruck"
# Cubietruck is an A20
#
no options ALLWINNER_A10
-no options CPU_CORTEXA8
no makeoptions CPUFLAGS
makeoptions CPUFLAGS="-mcpu=cortex-a7 -mfpu=neon"
