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/Makefile | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/ppc/boot/Makefile')
| -rw-r--r-- | arch/ppc/boot/Makefile | 17 |
1 files changed, 13 insertions, 4 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) |