PERFORCE change 71613 for review

[John-Mark Gurney]

http://perforce.freebsd.org/chv.cgi?CH=71613

Change 71613 by jmg at jmg_carbon on 2005/02/22 23:34:21

	comment out the BOOTP stuff, at least till we get the ethernet driver
	committed...  This means we now get to a mountroot> prompt.. so
	guess if we bring in md, we might be able to get to userland..
	
	also fix up options so that option lines are: "options<space><tab>"
	so they line up when commented out...

Affected files ...

.. //depot/projects/arm/src/sys/arm/conf/TS7200#4 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/conf/TS7200#4 (text+ko) ====

@@ -21,8 +21,8 @@
 ident		TS7200
 
 options 	PHYSADDR=0x00000000
-options		KERNPHYSADDR=0x00200000	
-options		KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
+options 	KERNPHYSADDR=0x00200000	
+options 	KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 makeoptions	KERNPHYSADDR=0x00200000
 makeoptions	KERNVIRTADDR=0xc0200000
 
@@ -35,10 +35,10 @@
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=arm9
-options		DDB
-#options		ARMFPE
-options		HZ=64
-#options		DEVICE_POLLING
+options 	DDB
+#options 	ARMFPE
+options 	HZ=64
+#options 	DEVICE_POLLING
 
 options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
@@ -62,12 +62,12 @@
 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_NFSV3
-options		BOOTP_WIRED_TO=em0
-options		BOOTP_COMPAT
-#options		PREEMPTION
+#options 	BOOTP
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_WIRED_TO=em0
+#options 	BOOTP_COMPAT
+#options 	PREEMPTION
 device		genclock
 device		loop
 device		ether
@@ -85,13 +85,13 @@
 					# output.  Adds ~215k to driver.
 
 # Debugging for use in -current
-options		KDB
+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
+#options 	DIAGNOSTIC
 
 # To make an SMP kernel, the next two are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel