mvme5100 one more time...

[Tom Rini]

On Fri, Aug 31, 2001 at 06:03:36PM +0200, Xavier Grave wrote:
>
> Le ven, 31 ao? 2001 17:49:27, Tom Rini a ?crit :
> >
> > Okay.  Try this.  Undo what I told you last time, and make the end of
> > the file look like:
> > #if 0
> >
> > 	.comm	.stack,4096*2,4
> > #endif
> >
> > This may or may not compile.  I have a feeling there'll be some egg on
> > my face shortly...
>
> it doesn't compile : I have the following message :
> head.o: In function `start_ldr':
> head.o(.text+0x176): undefined reference to `stack'
> head.o(.text+0x17a): undefined reference to `stack'
> make[2]: *** [zvmlinux] Erreur 1
>
> Why the eggs ? because it doesn't compile ? :-)

Well, my guess is that .stack is being defined twice, maybe...  The reg dump
makes it look like it's about to goto decompress_kernel.  Can you try the
following patch?  And undo what Itold you to do last time..

--
Tom Rini (TR1265)
http://gate.crashing.org/~trini/

===== arch/ppc/boot/common/util.S 1.1 vs edited =====
--- 1.1/arch/ppc/boot/common/util.S	Thu Aug  2 16:02:25 2001
+++ edited/arch/ppc/boot/common/util.S	Fri Aug 31 09:01:10 2001
@@ -116,4 +116,3 @@
 	addi	r3,r3,CACHE_LINE_SIZE	/* Next line, please */
 	bdnz	00b
 10:	blr
-	.comm	.stack,4096*2,4
===== arch/ppc/boot/prep/head.S 1.15 vs edited =====
--- 1.15/arch/ppc/boot/prep/head.S	Tue Aug 28 15:57:32 2001
+++ edited/arch/ppc/boot/prep/head.S	Fri Aug 31 09:00:56 2001
@@ -178,11 +178,9 @@
 	ori	r2,r2,initrd_end at l
 	lwz	r5,0(r2)

-
-	/* tell kernel we're prep */
-	/*
-	 * get start address of kernel code which is stored as a coff
-	 * entry.  see boot/head.S -- Cort
+	/* tell kernel we're prep, by putting 0xdeadc0de at KERNELLOAD,
+	 * and tell the kernel to start on the 4th instruction since we
+	 * overwrite the first 3 sometimes (which are 'nop').
 	 */
 	li	r9,0xc
 	mtlr	r9
@@ -191,5 +189,5 @@
 	li	r9,0
 	stw	r10,0(r9)
 	blr
-hang:
-	b	hang
+
+	.comm	.stack,4096*2,4

** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/