From owner-p4-projects@FreeBSD.ORG  Wed Feb 20 14:51:32 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F2C8316A405; Wed, 20 Feb 2008 14:51:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B89CA16A404
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 14:51:31 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A256813C4D3
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 14:51:31 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1KEpVQ0052897
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 14:51:31 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1KEpVkl052894
	for perforce@freebsd.org; Wed, 20 Feb 2008 14:51:31 GMT
	(envelope-from raj@freebsd.org)
Date: Wed, 20 Feb 2008 14:51:31 GMT
Message-Id: <200802201451.m1KEpVkl052894@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski <raj@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 135792 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 20 Feb 2008 14:51:32 -0000

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

Change 135792 by raj@raj_mimi on 2008/02/20 14:50:58

	o Don't switch to own stack. We should be fine on U-Boot's original
	  one; this also helps safely return to the caller when something goes
	  wrong in loader's early main() routine.
	
	o Eliminate WITH_UBOOT leftover.

Affected files ...

.. //depot/projects/e500/sys/boot/powerpc/uboot/start.S#8 edit
.. //depot/projects/e500/tools/build/options/WITH_UBOOT#2 delete

Differences ...

==== //depot/projects/e500/sys/boot/powerpc/uboot/start.S#8 (text+ko) ====

@@ -28,18 +28,12 @@
 
 #include <machine/asm.h>
 
-#define STACK_SIZE 8192
-
 /*
  * Entry point to the loader that U-Boot passes control to.
  */
         .text   
         .globl  _start
 _start:
-	/* Fix up a stack */
-	lis	%r1, stack@ha
-	addi	%r1, %r1, stack@l
-	addi	%r1, %r1, (STACK_SIZE - 32)
 	/* Hint where to look for the API signature */
 	lis	%r11, uboot_address@ha
 	addi	%r11, %r11, uboot_address@l
@@ -62,7 +56,7 @@
 	mflr	%r0
 	stw	%r14, 8(%r1)
 	stw	%r0, 20(%r1)
-	/* Restore U-Boot's r14 and r29 */
+	/* Restore U-Boot's r14 */
 	lis	%r11, saved_regs@ha
 	addi	%r11, %r11, saved_regs@l
 	lwz	%r14, 0(%r11)
@@ -70,7 +64,7 @@
 	mfmsr	%r11
 	ori	%r11, %r11, 0x8000@l
 	mtmsr	%r11
-	/* Call into u-Boot */
+	/* Call into U-Boot */
 	lis	%r11, syscall_ptr@ha
 	addi	%r11, %r11, syscall_ptr@l
 	lwz	%r11, 0(%r11)
@@ -92,10 +86,6 @@
  * Data section
  */
 	.data
-	.align	4
-stack:
-	.space	STACK_SIZE
-
 GLOBAL(syscall_ptr)
 	.long	0
 GLOBAL(saved_regs)