From owner-svn-src-all@FreeBSD.ORG  Sun Jan 10 05:36:39 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2048E106566B;
	Sun, 10 Jan 2010 05:36:39 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1066D8FC15;
	Sun, 10 Jan 2010 05:36:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0A5acuK030324;
	Sun, 10 Jan 2010 05:36:38 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0A5acVV030322;
	Sun, 10 Jan 2010 05:36:38 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201001100536.o0A5acVV030322@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 10 Jan 2010 05:36:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201985 - head/sys/conf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Jan 2010 05:36:39 -0000

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)		}