From 9f3ca038ff3b0eda42cbf2e0b23abc69c421dfd0 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Tue, 18 Jul 2006 22:03:33 +0000
Subject: [PATCH] MFC: Tweaks to config file

---
 sys/arm/conf/KB920X | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X
index 6a9ae2cf008..0bd78a348ec 100644
--- a/sys/arm/conf/KB920X
+++ b/sys/arm/conf/KB920X
@@ -21,17 +21,11 @@
 machine		arm
 ident		KB920X
 
-options		KERNPHYSADDR=0x20000000	
-options		KERNVIRTADDR=0xc0000000	
-options		PHYSADDR=0x20000000
-options		STARTUP_PAGETABLE_ADDR=0x20800000
-options		ARM32_NEW_VM_LAYOUT
 include		"../at91/std.kb920x"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		#Default places to look for devices.
 
-#makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-makeoptions	CONF_CFLAGS=-mcpu=arm9
+makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 options		DDB
 options		KDB
 
@@ -48,6 +42,9 @@ options 	FFS			#Berkeley Fast Filesystem
 options 	NFSCLIENT		#Network Filesystem Client
 #options 	NFSSERVER		#Network Filesystem Server
 options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options		BOOTP_NFSROOT
+options		BOOTP
+
 #options 	MSDOSFS			#MSDOS Filesystem
 #options 	CD9660			#ISO 9660 Filesystem
 #options 	PROCFS			#Process filesystem (requires PSEUDOFS)
@@ -58,23 +55,21 @@ 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 	SYSCTL_OMIT_DESCR
 options 	MUTEX_NOINLINE
+options		RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 device		genclock
+device		random
+device		pty
 device		loop
-options		BOOTP
-options		BOOTP_WIRED_TO=ate0
-options		BOOTP_NFSROOT
-options		BOOTP_NFSV3
-options		BOOTP_COMPAT
 device		ether
 device		nexus
 device		uart
 device		ate
-device		miibus
+device		mii
+device		lxtphy
 
 # Debugging for use in -current
 #options 	INVARIANTS		#Enable calls of extra sanity checking
@@ -85,5 +80,5 @@ device		miibus
 device		mem			# Memory and kernel memory devices
 device		md
 # device	at91_twi		# TWI: Two Wire Interface
-device		at91_spi		# SPI:
-options		COMPAT_43
+#device		at91_spi		# SPI:
+#device		spibus
-- 
2.45.2