PERFORCE change 119425 for review

[Bruce M Simpson]

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

Change 119425 by bms at bms_anglepoise on 2007/05/07 16:25:29

	update config to reflect
	a) this is a CFE based platform
	b) the device drivers ain't ready for primetime yet

Affected files ...

.. //depot/projects/mips2/src/sys/mips/conf/SENTRY5#3 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/conf/SENTRY5#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #
 # $FreeBSD$
-# $P4: //depot/projects/mips2/src/sys/mips/conf/SENTRY5#2 $
+# $P4: //depot/projects/mips2/src/sys/mips/conf/SENTRY5#3 $
 #
 # The Broadcom Sentry5 series of processors and boards is very commonly
 # used in COTS hardware including the Netgear WGT634U.
@@ -16,9 +16,6 @@
 #   SiliconBackplane, needs to be integrated to detect and probe hardware
 #   correctly.
 #
-# * Support for the CFE firmware needs to be brought in.
-#   http://ftp.riken.go.jp/pub/pub/NetBSD/NetBSD-current/src/sys/arch/mips/cfe/
-#
 # * The clock needs to be calibrated correctly, so that DELAY() may work.
 #   One problem with this is that the low-level printf() routine calls DELAY(),
 #   which currently causes divide-by-zero trap
@@ -32,10 +29,22 @@
 ident		SENTRY5
 cpu		CPU_MIPS4KC			# XXX MIPS32?
 options		CPU_NOFPU
-options		CPU_SENTRY5
+options		CPU_SENTRY5			# XXX should this be a
+						# sub-cpu option?
+
+# XXX only siba should be hardwired for now; we will use
+# bus enumeration there
 files		"../mips32/sentry5/files.sentry5"
-hints		"SENTRY5.hints"		#Default places to look for devices.
+hints		"SENTRY5.hints"
+
+# sentry5 normally ships with cfe firmware; use the console for now
+options		CFE
+options		CFE_CONSOLE
+options		ALT_BREAK_TO_DEBUGGER
 
+# cfe loader expects kernel at 0x80001000 for mips32 w/o backwards
+# offsets in the linked elf image (see ldscript hack)
+# XXX can we conditionalize the linker stuff on options CFE?
 options		KERNVIRTADDR=0x80001000
 
 #makeoptions	ARCH_FLAGS=-march=mips32
@@ -57,16 +66,17 @@
 options		INVARIANTS
 options		INVARIANT_SUPPORT
 
-# TODO: SiliconBackplane board support
+# TODO: SiliconBackplane board support.
 #device		siba
 
-device		pci
-device		uart
-device		uart_ns8250
+# XXX notyet; need to be auto probed children of siba0.
+#device		pci
+#device		uart
+#device		uart_ns8250
 
-# XXX Should this be bce or bfe?
-device		bfe
-device		miibus
+# XXX notyet; bfe needs to attach via siba *and* pci.
+#device		bfe
+#device		miibus
 
 device		genclock
 device		loop