summaryrefslogtreecommitdiffstats
path: root/arch/ppc/boot
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-12-04 03:58:56 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-12-04 03:58:56 +0000
commit1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch)
tree357efc7b93f8f5102110d20d293f41360ec212fc /arch/ppc/boot
parentaea27b2e18d69af87e673972246e66657b4fa274 (diff)
Merge with Linux 2.3.21.
Diffstat (limited to 'arch/ppc/boot')
-rw-r--r--arch/ppc/boot/Makefile11
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/ppc/boot/Makefile b/arch/ppc/boot/Makefile
index 9e637aa7b..8709e3729 100644
--- a/arch/ppc/boot/Makefile
+++ b/arch/ppc/boot/Makefile
@@ -25,6 +25,10 @@ ZSZ = 0
IOFF = 0
ISZ = 0
+ifeq ($(CONFIG_ALL_PPC),y)
+CONFIG_PREP=y
+endif
+
ifeq ($(CONFIG_SMP),y)
TFTPIMAGE=/tftpboot/zImage.prep.smp$(MSIZE)
else
@@ -72,16 +76,19 @@ zvmlinux.initrd: zvmlinux
rm zvmlinux.initrd.tmp
zImage: zvmlinux mkprep sImage
+ifdef CONFIG_PREP
./mkprep -pbp zvmlinux zImage
+endif
sImage: ../../../vmlinux
ifdef CONFIG_GEMINI
$(OBJCOPY) -I elf32-powerpc -O binary ../../../vmlinux sImage
-else
endif
zImage.initrd: zvmlinux.initrd mkprep
+ifdef CONFIG_PREP
./mkprep -pbp zvmlinux.initrd zImage.initrd
+endif
zvmlinux: $(OBJECTS) ../coffboot/vmlinux.gz
#
@@ -110,7 +117,9 @@ mkprep : mkprep.c
$(HOSTCC) -o mkprep mkprep.c
znetboot : zImage
+ifdef CONFIG_PREP
cp zImage $(TFTPIMAGE)
+endif
ifdef CONFIG_GEMINI
cp sImage /tftpboot/
endif