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 | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/ppc/boot')
| -rw-r--r-- | arch/ppc/boot/Makefile | 17 | ||||
| -rw-r--r-- | arch/ppc/boot/head.S | 7 | ||||
| -rw-r--r-- | arch/ppc/boot/misc.c | 6 |
3 files changed, 17 insertions, 13 deletions
diff --git a/arch/ppc/boot/Makefile b/arch/ppc/boot/Makefile index 58c9c3c82..9e637aa7b 100644 --- a/arch/ppc/boot/Makefile +++ b/arch/ppc/boot/Makefile @@ -47,9 +47,9 @@ OBJCOPY = $(CROSS_COMPILE)objcopy OBJCOPY_ARGS = -O elf32-powerpc OBJECTS += vreset.o kbd.o of1275.o - ifeq ($(CONFIG_SERIAL_CONSOLE),y) - OBJECTS += ns16550.o - endif +ifeq ($(CONFIG_SERIAL_CONSOLE),y) +OBJECTS += ns16550.o +endif all: zImage @@ -71,9 +71,15 @@ zvmlinux.initrd: zvmlinux zvmlinux.initrd.tmp $@ rm zvmlinux.initrd.tmp -zImage: zvmlinux mkprep +zImage: zvmlinux mkprep sImage ./mkprep -pbp zvmlinux zImage +sImage: ../../../vmlinux +ifdef CONFIG_GEMINI + $(OBJCOPY) -I elf32-powerpc -O binary ../../../vmlinux sImage +else +endif + zImage.initrd: zvmlinux.initrd mkprep ./mkprep -pbp zvmlinux.initrd zImage.initrd @@ -105,6 +111,9 @@ mkprep : mkprep.c znetboot : zImage cp zImage $(TFTPIMAGE) +ifdef CONFIG_GEMINI + cp sImage /tftpboot/ +endif znetboot.initrd : zImage.initrd cp zImage.initrd $(TFTPIMAGE) 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 diff --git a/arch/ppc/boot/misc.c b/arch/ppc/boot/misc.c index 65b0e74a6..aee407542 100644 --- a/arch/ppc/boot/misc.c +++ b/arch/ppc/boot/misc.c @@ -1,7 +1,7 @@ /* * misc.c * - * $Id: misc.c,v 1.65 1999/05/17 19:11:13 cort Exp $ + * $Id: misc.c,v 1.67 1999/08/10 22:53:57 cort Exp $ * * Adapted for PowerPC by Gary Thomas * @@ -309,8 +309,6 @@ void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp) inflateEnd(&s); } -unsigned char sanity[0x2000]; - unsigned long decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum, RESIDUAL *residual, void *OFW_interface) @@ -333,7 +331,6 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum, cols = 80; orig_x = 0; orig_y = 24; - /* * IBM's have the MMU on, so we have to disable it or @@ -525,7 +522,6 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum, puts("initrd_start located > 16M\n"); puts("Uncompressing Linux..."); - gunzip(0, 0x400000, zimage_start, &zimage_size); puts("done.\n"); puts("Now booting the kernel\n"); |