From owner-p4-projects@FreeBSD.ORG  Sun Feb 20 20:29:52 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C756516A4D0; Sun, 20 Feb 2005 20:29:51 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8732016A4CE
	for <perforce@freebsd.org>; Sun, 20 Feb 2005 20:29:51 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7116843D1F
	for <perforce@freebsd.org>; Sun, 20 Feb 2005 20:29:51 +0000 (GMT)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1KKTpal054679
	for <perforce@freebsd.org>; Sun, 20 Feb 2005 20:29:51 GMT
	(envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1KKTpnO054676
	for perforce@freebsd.org; Sun, 20 Feb 2005 20:29:51 GMT
	(envelope-from jmg@freebsd.org)
Date: Sun, 20 Feb 2005 20:29:51 GMT
Message-Id: <200502202029.j1KKTpnO054676@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 71399 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Feb 2005 20:29:52 -0000

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

Change 71399 by jmg@jmg_carbon on 2005/02/20 20:29:14

	remove the conditionals on the fixup, w/ them the TS-7200 won't
	properly relocate...

Affected files ...

.. //depot/projects/arm/src/sys/arm/arm/locore.S#3 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/arm/locore.S#3 (text+ko) ====

@@ -160,13 +160,14 @@
 	subs	r2, r2, #4
 	bgt	.L1
 
+	/* fix up the pc to be at KERNVIRTADDR */
 	ldr	r4, =KERNVIRTADDR
 	cmp	pc, r4
 #if	KERNVIRTADDR > KERNPHYSADDR
-	ldrlt	r4, =KERNVIRTADDR
-	ldrlt	r5, =KERNPHYSADDR
-	sublt	r4, r4, r5
-	addlt	pc, pc, r4
+	ldr	r4, =KERNVIRTADDR
+	ldr	r5, =KERNPHYSADDR
+	sub	r4, r4, r5
+	add	pc, pc, r4
 #else
 	ldrgt	r4, =KERNPHYSADDR
 	ldrgt	r5, =KERNVIRTADDR