svn commit: r236845 - head/sys/arm/conf

[Andrew Turner]

Author: andrew
Date: Sun Jun 10 10:37:21 2012
New Revision: 236845
URL: http://svn.freebsd.org/changeset/base/236845

Log:
  The GUMSTIX-QEMU config file is almost identical to the GUMSTIX config,
  include the latter file from the former rather than duplicating it.

Modified:
  head/sys/arm/conf/GUMSTIX-QEMU

Modified: head/sys/arm/conf/GUMSTIX-QEMU
==============================================================================
--- head/sys/arm/conf/GUMSTIX-QEMU	Sun Jun 10 08:34:04 2012	(r236844)
+++ head/sys/arm/conf/GUMSTIX-QEMU	Sun Jun 10 10:37:21 2012	(r236845)
@@ -17,76 +17,9 @@
 #
 # $FreeBSD$
 
-ident		GUMSTIX-QEMU
-cpu		CPU_XSCALE_PXA2X0
-
-# This probably wants to move somewhere else.  Maybe we can create a basic
-# PXA2X0 config, then make a GUMSTIX config that includes the basic one,
-# adds the smc and smcphy devices and pulls in this hints file.
-hints		"GUMSTIX.hints"
-
-options 	PHYSADDR=0xa0000000
-options 	KERNPHYSADDR=0xa0200000	
-options 	KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
-
-options 	STARTUP_PAGETABLE_ADDR=0xa0000000
-include		"../xscale/pxa/std.pxa"
-makeoptions	MODULES_OVERRIDE=""
+include 	GUMSTIX
 
-makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-options 	HZ=100
-#options 	DEVICE_POLLING
+ident		GUMSTIX-QEMU
 
 options		QEMU_WORKAROUNDS
 nooptions	ARM_CACHE_LOCK_ENABLE	# QEMU does not implement this
-
-options 	SCHED_4BSD		#4BSD scheduler
-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 	NFSCL			#New Network Filesystem Client
-#options 	NFSD			#New Network Filesystem Server
-options 	NFS_ROOT		#NFS usable as /, requires NFSCL
-#options 	MSDOSFS			#MSDOS Filesystem
-#options 	CD9660			#ISO 9660 Filesystem
-#options 	PROCFS			#Process filesystem (requires PSEUDOFS)
-options 	PSEUDOFS		#Pseudo-filesystem framework
-options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-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 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options 	BOOTP
-options 	BOOTP_NFSROOT
-options 	BOOTP_WIRED_TO=smc0
-options 	BOOTP_COMPAT
-options 	BOOTP_NFSV3
-options 	BOOTP_BLOCKSIZE=4096
-options 	PREEMPTION
-device		loop
-device		ether
-device		mii
-device		mii_bitbang
-device		smc
-device		smcphy
-device		uart
-device		uart_ns8250
-
-# Debugging for use in -current
-options 	KDB
-options 	DDB			#Enable the kernel debugger
-#options 	DEADLKRES		#Enable the deadlock resolver
-#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
-
-device		md
-device		random		# Entropy device