MFH: r281855-r282312

Sponsored by:	The FreeBSD Foundation

1 files changed, 7 insertions, 114 deletions

diff --git a/sys/arm/conf/ODROIDC1 b/sys/arm/conf/ODROIDC1
index 7d70fa4..7bb7b56 100644
--- a/sys/arm/conf/ODROIDC1
+++ b/sys/arm/conf/ODROIDC1
@@ -1,7 +1,7 @@
 # ODROIDC1 -- Custom configuration for the HardKernel ODROID-C1 SBC
 #
-# For more information on this file, please read the handbook section on
-# Kernel Configuration Files:
+# For more information on this file, please read the config(5) manual page,
+# and/or the handbook section on Kernel Configuration Files:
 #
 #    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
 #
@@ -17,117 +17,10 @@
 #
 # $FreeBSD$
 
-ident		ODROIDC1
-
-include		"../amlogic/aml8726/std.odroidc1"
-
-options		HZ=100
-options		SCHED_ULE		# ULE scheduler
-options		PREEMPTION		# Enable kernel thread preemption
-options		INET			# InterNETworking
-options		INET6			# IPv6 communications protocols
-options		FFS			# Berkeley Fast Filesystem
-options		SOFTUPDATES		# Enable FFS soft updates support
-options		UFS_ACL			# Support for access control lists
-options		UFS_DIRHASH		# Improve performance on big directories
-options		PROCFS			# Process filesystem (requires PSEUDOFS)
-options		PSEUDOFS		# Pseudo-filesystem framework
-options		GEOM_PART_BSD		# BSD partition scheme
-options		GEOM_PART_MBR		# MBR partition scheme
-options		SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
-options		KTRACE			# ktrace(1) support
-options		SYSVSHM			# SYSV-style shared memory
-options		SYSVMSG			# SYSV-style message queues
-options		SYSVSEM			# SYSV-style semaphores
-options		_KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions
-options		PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
-options		KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options		LINUX_BOOT_ABI
-options		VFP			# vfp/neon
-
-# Debugging
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options		ALT_BREAK_TO_DEBUGGER
-#options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
-options		BOOTVERBOSE=1
-options		KDB
-options		DDB			# Enable the kernel debugger
-options		INVARIANTS		# Enable calls of extra sanity checking
-options		INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-options		WITNESS			# Enable checks to detect deadlocks and cycles
-options		WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
-#options 	DIAGNOSTIC
-
-# NFS support
-#options 	NFSCL			# New Network Filesystem Client
-#options 	NFSLOCKD		# Network Lock Manager
-#options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-
-# NFS root from boopt/dhcp
-#options 	BOOTP
-#options 	BOOTP_NFSROOT
-#options 	BOOTP_COMPAT
-#options 	BOOTP_NFSV3
-#options 	BOOTP_WIRED_TO=axe0
-
-# MMC/SD/SDIO card slot support
-device		mmc			# mmc/sd bus
-device		mmcsd			# mmc/sd flash cards
-
-# Boot device is 2nd slice on MMC/SD card
-options		ROOTDEVNAME=\"ufs:mmcsd0s2\"
-
-# GPIO
-device		gpio
-device		gpioled
-
-# I2C support
-device		iicbus
-device		iicbb
-device		iic
+#NO_UNIVERSE
 
-# vt is the default console driver, resembling an SCO console
-device		vt
-#device		kbdmux
-
-# Serial (COM) ports
-device		uart			# Generic UART driver
-
-# Pseudo devices.
-device		loop			# Network loopback
-device		random			# Entropy device
-device		ether			# Ethernet support
-device		pty			# BSD-style compatibility pseudo ttys
-
-# The `bpf' device enables the Berkeley Packet Filter.
-# Be aware of the administrative consequences of enabling this!
-# Note that 'bpf' is required for DHCP.
-device		bpf			# Berkeley packet filter
-
-# USB support
-device		usb			# General USB code (mandatory for USB)
-device		dwcotg			# DWC OTG controller
-options		USB_HOST_ALIGN=64	# Cacheline size is 64
-options		USB_DEBUG
-#options 	USB_REQ_DEBUG
-#options 	USB_VERBOSE
-
-#device		ukbd			# USB keyboard
-#device		ums			# USB mouse
-
-device		scbus			# SCSI bus (required for ATA/SCSI)
-device		da			# Direct Access (disks)
-device		umass			# Disks/Mass storage - Requires scbus and da
-
-# Ethernet support
-device		miibus			# MII bus support
-
-# SoC Ethernet, requires miibus
-device		dwc
-
-# USB Ethernet, requires miibus
-device		axe			# ASIX Electronics USB Ethernet
+include 	"AML8726"
+ident		ODROIDC1
 
-# Flattened Device Tree
-options		FDT
-options		FDT_DTB_STATIC
+options 	FDT_DTB_STATIC
+makeoptions	FDT_DTS_FILE=odroidc1.dts