Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/evbarm/conf/Attic/CUBOX-I,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/evbarm/conf/Attic/CUBOX-I,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.13 retrieving revision 1.13.2.3 diff -u -p -r1.13 -r1.13.2.3 --- src/sys/arch/evbarm/conf/Attic/CUBOX-I 2018/06/05 08:03:28 1.13 +++ src/sys/arch/evbarm/conf/Attic/CUBOX-I 2020/04/13 08:03:42 1.13.2.3 @@ -1,4 +1,4 @@ -# $NetBSD: CUBOX-I,v 1.13 2018/06/05 08:03:28 hkenken Exp $ +# $NetBSD: CUBOX-I,v 1.13.2.3 2020/04/13 08:03:42 martin Exp $ # # CuBox-i # - http://www.solid-run.com/products/cubox-i-mini-computer/ @@ -21,6 +21,7 @@ options CPU_CORTEXA9 options IMX6 options MULTIPROCESSOR options PMAPCOUNTERS +makeoptions CPUFLAGS="-march=armv7-a -mfpu=vfpv3" # Standard system options @@ -46,7 +47,6 @@ options BUFQ_PRIOCSCAN # Diagnostic/debugging support options options VERBOSE_INIT_ARM # verbose bootstraping messages -#options PERFCTRS # performance counters options DIAGNOSTIC # internally consistency checks #options DEBUG @@ -62,7 +62,6 @@ options DDB # in-kernel debugger options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic' options DDB_HISTORY_SIZE=100 # Enable history editing in DDB options DDB_VERBOSE_HELP -#options IPKDB # remote kernel debugging #options KGDB #options KGDB_DEVNAME="\"imxuart\"" #options KGDB_DEVADDR=0x02020000 @@ -80,7 +79,6 @@ include "conf/compat_netbsd60.config" options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility -#options COMPAT_NDIS # NDIS network driver # Wedge support options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances @@ -102,7 +100,6 @@ file-system NULLFS # loopback file syst file-system OVERLAY # overlay file system file-system PROCFS # /proc file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) -file-system SMBFS # experimental - CIFS; also needs nsmb (below) file-system UMAPFS # NULLFS + uid and gid remapping file-system UNION # union file system file-system CODA # Coda File System; also needs vcoda (below) @@ -138,10 +135,6 @@ 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 IPFILTER_LOG # ipmon(8) log support -options IPFILTER_LOOKUP # ippool(8) support -options IPFILTER_COMPAT # Compat for IP-Filter -#options IPFILTER_DEFAULT_BLOCK # block all packets by default #options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG #options ALTQ # Manipulate network interfaces' output queues @@ -161,7 +154,6 @@ options IPFILTER_COMPAT # Compat for IP # Console options. also need IMXUARTCONSOLE options CONSDEVNAME="\"imxuart\"",CONADDR=0x02020000,CONSPEED=115200 -options CONS_OVERRIDE # These options enable verbose messages for several subsystems. # Warning, these may compile large string tables into the kernel! @@ -199,7 +191,7 @@ armperiph0 at mainbus? # A9 On-Chip Per armgic0 at armperiph? # ARM Generic Interrupt Controller arml2cc0 at armperiph? flags 0 # ARM PL310 L2CC arma9tmr0 at armperiph? # A9 Global Timer -#a9wdt0 at armperiph? flags 0 # A9 Watchdog Timer +#arma9wdt0 at armperiph? flags 0 # A9 Watchdog Timer axi0 at mainbus? @@ -216,7 +208,6 @@ imxgpio4 at axi? addr 0x020ac000 irqbase imxgpio5 at axi? addr 0x020b0000 irqbase 416 irq 108 imxgpio6 at axi? addr 0x020b4000 irqbase 448 irq 110 gpio* at imxgpio? -options IMX_GPIO_INTR_SPLIT # Clock Control imxccm0 at axi? addr 0x020c4000 @@ -352,13 +343,11 @@ options VND_COMPRESSION # compressed v # network pseudo-devices pseudo-device bpfilter # Berkeley packet filter #pseudo-device carp # Common Address Redundancy Protocol -#pseudo-device ipfilter # IP filter (firewall) and NAT pseudo-device loop # network loopback #pseudo-device mpls # MPLS pseudo-interface pseudo-device ppp # Point-to-Point Protocol pseudo-device pppoe # PPP over Ethernet (RFC 2516) pseudo-device sl # Serial Line IP -pseudo-device strip # Starmode Radio IP (Metricom) pseudo-device irframetty # IrDA frame line discipline pseudo-device tun # network tunneling over tty pseudo-device tap # virtual Ethernet @@ -370,9 +359,6 @@ pseudo-device vlan # IEEE 802.1q encap pseudo-device bridge # simple inter-network bridging #options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too pseudo-device agr # IEEE 802.3ad link aggregation -#pseudo-device pf # PF packet filter -#pseudo-device pflog # PF log if -#pseudo-device pfsync # PF sync if #pseudo-device npf # NPF packet filter # @@ -383,7 +369,6 @@ pseudo-device accf_http # "httpready" a # miscellaneous pseudo-devices pseudo-device pty # pseudo-terminals pseudo-device sequencer # MIDI sequencer -# rnd works; RND_COM does not on port i386 yet. #options RND_COM # use "com" randomness as well (BROKEN) pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms @@ -394,9 +379,6 @@ pseudo-device btuart # Bluetooth HCI U # a pseudo device needed for Coda # also needs CODA (above) pseudo-device vcoda # coda minicache <-> venus comm. -# a pseudo device needed for SMBFS -pseudo-device nsmb # experimental - SMB requester - # wscons pseudo-devices pseudo-device wsmux # mouse & keyboard multiplexor pseudo-device wsfont @@ -407,21 +389,8 @@ pseudo-device wsfont # userland interface to drivers, including autoconf and properties retrieval pseudo-device drvctl -options FILEASSOC # fileassoc(9) - required for Veriexec - # and PAX_SEGVGUARD - # Veriexec -# -# a pseudo device needed for veriexec -pseudo-device veriexec -# -# Uncomment the fingerprint methods below that are desired. Note that -# removing fingerprint methods will have almost no impact on the kernel -# code size. -# -options VERIFIED_EXEC_FP_SHA256 -options VERIFIED_EXEC_FP_SHA384 -options VERIFIED_EXEC_FP_SHA512 +include "dev/veriexec.config" options PAX_MPROTECT=0 # PaX mprotect(2) restrictions options PAX_ASLR=0 # PaX Address Space Layout Randomization