svn commit: r198311 - in projects/mips/sys: conf mips/conf

[Neel Natu]

Author: neel
Date: Wed Oct 21 00:56:13 2009
New Revision: 198311
URL: http://svn.freebsd.org/changeset/base/198311

Log:
  Update options.mips to support config options required to build the SWARM
  kernel.
  
  The SWARM kernel does not build yet but at least it gets past the kernel
  config stage.
  
  Approved by: imp (mentor)

Modified:
  projects/mips/sys/conf/options.mips
  projects/mips/sys/mips/conf/SWARM

Modified: projects/mips/sys/conf/options.mips
==============================================================================
--- projects/mips/sys/conf/options.mips	Tue Oct 20 23:13:08 2009	(r198310)
+++ projects/mips/sys/conf/options.mips	Wed Oct 21 00:56:13 2009	(r198311)
@@ -33,6 +33,7 @@ CPU_MIPS32	opt_global.h
 CPU_MIPS64	opt_global.h
 CPU_SENTRY5	opt_global.h
 CPU_HAVEFPU	opt_global.h
+CPU_SB1 	opt_global.h
 
 ISA_MIPS1	opt_cputype.h
 ISA_MIPS3	opt_cputype.h
@@ -56,3 +57,16 @@ TARGET_EMULATOR	opt_ddb.h
 
 TICK_USE_YAMON_FREQ	opt_global.h
 TICK_USE_MALTA_RTC	opt_global.h
+
+#
+# The MIPS architecture does not have separate memory and i/o address space
+# like x86. However some MIPS processors provide a memory-mapped window that
+# maps onto the PCI I/O space.
+#
+PCI_IOSPACE_SIZE        opt_global.h
+PCI_IOSPACE_ADDR        opt_global.h
+
+#
+# The highest memory address that can be used by the kernel in units of KB.
+#
+MAXMEM			opt_global.h

Modified: projects/mips/sys/mips/conf/SWARM
==============================================================================
--- projects/mips/sys/mips/conf/SWARM	Tue Oct 20 23:13:08 2009	(r198310)
+++ projects/mips/sys/mips/conf/SWARM	Wed Oct 21 00:56:13 2009	(r198311)
@@ -3,7 +3,6 @@
 #
 
 ident		SWARM
-options		CPU_NOFPU
 options		CPU_SB1
 
 files		"../sibyte/files.sibyte"
@@ -14,8 +13,9 @@ options		PCI_IOSPACE_SIZE=0x02000000
 
 #
 # 32-bit kernel cannot deal with physical memory beyond 4GB
+# XXX pmap assumes that all the memory can be mapped using KSEG0
 #
-options		MAXMEM=4096*1024
+options		MAXMEM=512*1024
 
 options		CFE
 options		CFE_CONSOLE
@@ -54,8 +54,6 @@ options		INVARIANTS
 options		INVARIANT_SUPPORT
 options		WITNESS
 
-options		MD_ROOT
-options		MD_ROOT_SIZE=4096
 options 	FFS			#Fast filesystem
 
 device		pci
@@ -64,6 +62,7 @@ device		bge
 device		loop
 device		ether
 device		md
+device		random
 
 options		USB_DEBUG
 device usb