diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/ppc/boot/head.S | |
parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) |
Merge with 2.3.19.
Diffstat (limited to 'arch/ppc/boot/head.S')
-rw-r--r-- | arch/ppc/boot/head.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/ppc/boot/head.S b/arch/ppc/boot/head.S index 552e82fa1..79377a2ac 100644 --- a/arch/ppc/boot/head.S +++ b/arch/ppc/boot/head.S @@ -6,7 +6,7 @@ .text /* - * $Id: head.S,v 1.31 1999/04/22 06:32:00 davem Exp $ + * $Id: head.S,v 1.33 1999/09/08 01:06:58 cort Exp $ * * Boot loader philosophy: * ROM loads us to some arbitrary location @@ -125,12 +125,11 @@ start_ldr: * get start address of kernel code which is stored as a coff * entry. see boot/head.S -- Cort */ - li r9,0x0 - lwz r9,0(r9) + li r9,0x4 mtlr r9 - li r9,0 lis r10,0xdeadc0de@h ori r10,r10,0xdeadc0de@l + li r9,0 stw r10,0(r9) /* * The Radstone firmware maps PCI memory at 0xc0000000 using BAT2 |