patch-2.4.1 linux/arch/ppc/boot/Makefile

• Lines: 70
• Date: Mon Jan 22 15:41:14 2001
• Orig file: v2.4.0/linux/arch/ppc/boot/Makefile
• Orig date: Mon Jun 19 17:59:35 2000

diff -u --recursive --new-file v2.4.0/linux/arch/ppc/boot/Makefile linux/arch/ppc/boot/Makefile
@@ -25,22 +25,12 @@
 IOFF = 0
 ISZ = 0
 
-ifeq ($(CONFIG_ALL_PPC),y)
-CONFIG_PREP=y
-endif
-
 ifeq ($(CONFIG_SMP),y)
 TFTPIMAGE=/tftpboot/zImage.prep.smp$(MSIZE)
 else
 TFTPIMAGE=/tftpboot/zImage.prep$(MSIZE)
 endif
 
-ifeq ($(CONFIG_SMP),y)
-TFTPSIMAGE=/tftpboot/sImage.smp
-else
-TFTPSIMAGE=/tftpboot/sImage
-endif
-
 ifeq ($(CONFIG_PPC64BRIDGE),y)
 MSIZE=.64
 else
@@ -81,8 +71,8 @@
 		zvmlinux.initrd.tmp $@
 	rm zvmlinux.initrd.tmp
 
-zImage: zvmlinux mkprep sImage
-ifdef CONFIG_PREP
+zImage: zvmlinux mkprep
+ifdef CONFIG_ALL_PPC
 	./mkprep -pbp zvmlinux zImage
 endif
 ifdef CONFIG_APUS
@@ -90,13 +80,8 @@
 	gzip $(GZIP_FLAGS) vmapus
 endif
 
-sImage: ../../../vmlinux
-ifdef CONFIG_GEMINI
-	$(OBJCOPY) -I elf32-powerpc -O binary ../../../vmlinux sImage
-endif
-
 zImage.initrd: zvmlinux.initrd mkprep
-ifdef CONFIG_PREP
+ifdef CONFIG_ALL_PPC
 	./mkprep -pbp zvmlinux.initrd zImage.initrd
 endif
 
@@ -128,18 +113,15 @@
 	$(HOSTCC) -o mkprep mkprep.c
 
 znetboot : zImage
-ifdef CONFIG_PREP
+ifdef CONFIG_ALL_PPC
 	cp zImage $(TFTPIMAGE)
 endif
-ifdef CONFIG_GEMINI
-	cp sImage $(TFTPSIMAGE)
-endif
 
 znetboot.initrd : zImage.initrd
 	cp zImage.initrd $(TFTPIMAGE)
 
 clean:
-	rm -f vmlinux* zvmlinux* mkprep zImage* sImage*
+	rm -f vmlinux* zvmlinux* mkprep zImage*
 
 fastdep:
 	$(TOPDIR)/scripts/mkdep *.[Sch] > .depend