svn commit: r201985 - head/sys/conf

[Warner Losh]

Author: imp
Date: Sun Jan 10 05:36:38 2010
New Revision: 201985
URL: http://svn.freebsd.org/changeset/base/201985

Log:
  Merge r187418 from projects/mips to head by hand:
  
  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/conf/ldscript.mips

Modified: head/sys/conf/ldscript.mips
==============================================================================
--- head/sys/conf/ldscript.mips	Sun Jan 10 05:34:46 2010	(r201984)
+++ head/sys/conf/ldscript.mips	Sun Jan 10 05:36:38 2010	(r201985)
@@ -43,7 +43,7 @@ PROVIDE (_DYNAMIC = 0);
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  . = 0x80100000 + SIZEOF_HEADERS;
+  . = KERNLOADADDR + SIZEOF_HEADERS;
   .interp     : { *(.interp) 	}
   .hash          : { *(.hash)		}
   .dynsym        : { *(.dynsym)		}