svn commit: r202034 - head/sys/mips/conf

[Warner Losh]

Author: imp
Date: Sun Jan 10 20:03:16 2010
New Revision: 202034
URL: http://svn.freebsd.org/changeset/base/202034

Log:
  Merge from projects/mips to head by hand:
  
  I think these are the relevant changes, but definitely are a superset
  of them.  Software archaeologists are invited to check the branch
  itself for the details.
  
  r199695 | imp | 2009-11-23 00:49:50 -0700 (Mon, 23 Nov 2009) | 2 lines
  Specify loader script and load address
  
  r198263 | neel | 2009-10-19 22:31:20 -0600 (Mon, 19 Oct 2009) | 7 lines
  The default KERNLOADADDR does not work on MALTA hardware. On my platform the
  "First free SDRAM address" reported by YAMON is 0x800b6e61.
  So use a conservative KERNLOADADDR of 0x80100000.
  Approved by: imp (mentor)
  
  r194163 | imp | 2009-06-14 00:12:21 -0600 (Sun, 14 Jun 2009) | 2 lines
  Kludge: pretend to be ISA_MIPS32 for the moment.
  
  r192864 | gonzo | 2009-05-26 16:40:12 -0600 (Tue, 26 May 2009) | 4 lines
  - Replace CPU_NOFPU and SOFTFLOAT options with CPU_FPU. By default
     we assume that there is no FPU, because majority of SoC does
     not have it.
  
  r187461 | gonzo | 2009-01-19 21:24:03 -0700 (Mon, 19 Jan 2009) | 3 lines
  - KERNLOADADDR should be defined with makeoption.
      Redboot loads kernel now
  
  r187418 | gonzo | 2009-01-18 19:37:10 -0700 (Sun, 18 Jan 2009) | 4 lines
  - Add trampoline stuff for bootloaders that do not support ELF
  - Replace arm'ish KERNPHYSADDR/KERNVIRTADDR with
      KERNLOADADDR/TRAMPLOADADDR and clean configs

Modified:
  head/sys/mips/conf/MALTA
  head/sys/mips/conf/SENTRY5

Modified: head/sys/mips/conf/MALTA
==============================================================================
--- head/sys/mips/conf/MALTA	Sun Jan 10 19:54:18 2010	(r202033)
+++ head/sys/mips/conf/MALTA	Sun Jan 10 20:03:16 2010	(r202034)
@@ -21,6 +21,7 @@ ident		MALTA
 
 #makeoptions	ARCH_FLAGS=-march=mips32
 makeoptions	MIPS_LITTLE_ENDIAN=defined
+makeoptions	KERNLOADADDR=0x80100000
 
 options 	YAMON
 
@@ -33,6 +34,8 @@ options 	TICK_USE_YAMON_FREQ=defined
 
 include		"../malta/std.malta"
 
+options		ISA_MIPS32
+
 hints		"MALTA.hints"		#Default places to look for devices.
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols

Modified: head/sys/mips/conf/SENTRY5
==============================================================================
--- head/sys/mips/conf/SENTRY5	Sun Jan 10 19:54:18 2010	(r202033)
+++ head/sys/mips/conf/SENTRY5	Sun Jan 10 20:03:16 2010	(r202034)
@@ -26,9 +26,8 @@
 
 ident		SENTRY5
 cpu		CPU_MIPS4KC
-options 	CPU_NOFPU
 options 	ISA_MIPS32
-options 	CPU_SENTRY5			# XXX should this be a
+options		CPU_SENTRY5			# XXX should this be a
 						# sub-cpu option?
 
 # XXX only siba should be hardwired for now; we will use
@@ -37,50 +36,43 @@ files		"../sentry5/files.sentry5"
 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	LDSCRIPT_NAME=	ldscript.mips.cfe
+options		CFE
+options		CFE_CONSOLE
+options		ALT_BREAK_TO_DEBUGGER
 
 #makeoptions	ARCH_FLAGS=-march=mips32
 makeoptions	MIPS_LITTLE_ENDIAN=defined
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	MODULES_OVERRIDE=""
 
-options 	DDB
-options 	KDB
+options		DDB
+options		KDB
 
-options 	SCHED_4BSD		#4BSD scheduler
-options 	INET			#InterNETworking
-options 	NFSCLIENT		#Network Filesystem Client
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
-options 	PSEUDOFS		#Pseudo-filesystem framework
-options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options		SCHED_4BSD		#4BSD scheduler
+options		INET			#InterNETworking
+options		NFSCLIENT		#Network Filesystem Client
+options		NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options		PSEUDOFS		#Pseudo-filesystem framework
+options		_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 
 # Debugging for use in -current
-options 	INVARIANTS
-options 	INVARIANT_SUPPORT
+options		INVARIANTS
+options		INVARIANT_SUPPORT
 
-#options 	BUS_DEBUG
+#options		BUS_DEBUG
 #makeoptions	BUS_DEBUG
 
 device		siba			# Sonics SiliconBackplane
 device		pci			# siba_pcib
 
-device		bfe			# XXX will build both pci and siba
-device		miibus			# attachments
+# device		bfe			# XXX will build both pci and siba
+# device		miibus			# attachments
 
 # pci devices
 # notyet:
 #device		ath			# in pci slot
 #device		ath_hal			# pci chip support
-#options 	AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
+#options		AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
 
 device		usb			# USB Bus (required)
 device		uhci			# UHCI PCI->USB interface