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

Next file: linux/arch/ppc/boot/cortstrip.c
Previous file: linux/arch/ppc/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.47/linux/arch/ppc/boot/Makefile linux/arch/ppc/boot/Makefile
@@ -7,6 +7,7 @@
 #
 # Copyright (C) 1994 by Linus Torvalds
 # Adapted for PowerPC by Gary Thomas
+# modified by Cort (cort@cs.nmt.edu)
 #
 
 .c.s:
@@ -22,7 +23,7 @@
 
 
 ZLINKFLAGS = -T ../ld.script -Ttext 0x00800000
-GZIP_FLAGS = -9
+GZIP_FLAGS = -v9
 
 SYSTEM = $(TOPDIR)/vmlinux
 
@@ -32,49 +33,51 @@
 
 all:	$(TOPDIR)/zImage
 
-mkboot : cortstrip.c
-	$(HOSTCC) $(CFLAGSINC) -Wl,-static -o mkboot cortstrip.c
+mkprep : mkprep.c
+	$(HOSTCC) $(CFLAGSINC) -o mkprep mkprep.c
+
+find_name : find_name.c
+	$(HOSTCC) $(CFLAGSINC) -o find_name find_name.c
 
 mk_type41: mk_type41.c
-	$(HOSTCC) $(CFLAGSINC) -Wl,-static -o mk_type41 mk_type41.c
+	$(HOSTCC) $(CFLAGSINC) -o mk_type41 mk_type41.c
+
+piggyback: piggyback.c
+	$(HOSTCC) $(CFLAGS) -o piggyback piggyback.c
 
-floppy: zImage $(TOPDIR)/vmlinux
+floppy: $(TOPDIR)/vmlinux zImage 
 	dd if=$(TOPDIR)/zImage of=/dev/fd0H1440 bs=64b
 
-netboot : $(TOPDIR)/vmlinux mkboot
-	mkboot $(TOPDIR)/vmlinux $(TOPDIR)/netboot
-#	rcp $(TOPDIR)/netboot charon:/usr/tftpboot/vmlinux
+netboot : $(TOPDIR)/vmlinux mkprep
+	mkprep $(TOPDIR)/vmlinux $(TOPDIR)/netboot
+
+znetboot : zvmlinux mkprep
+	mkprep zvmlinux $(TOPDIR)/znetboot
+	cp $(TOPDIR)/znetboot /usr/local/tftpboot/vmlinux
 
-znetboot : mkboot zvmlinux
-	mkboot zvmlinux $(TOPDIR)/znetboot
+rcpboot : znetboot
 	rcp $(TOPDIR)/znetboot charon:/usr/tftpboot/vmlinux
 
-zImage: mk_type41 zvmlinux
-# make znetboot ourselves since using the normal dep
-# will rcp it -- Cort
-	mkboot zvmlinux $(TOPDIR)/znetboot
-	mk_type41 $(TOPDIR)/znetboot $(TOPDIR)/zImage
+zImage: zvmlinux mkprep
+	mkprep -pbp zvmlinux $(TOPDIR)/zImage
 
 install: zImage
 	dd if=$(TOPDIR)/zImage of=/dev/sda4
 	ln -s /dev/sda4 $(INSTALL_PATH)/vmlinuz
 	cp $(TOPDIR)/System.map $(INSTALL_PATH)/	
 
-zvmlinux: $(OBJECTS) $(SYSTEM) piggyback netboot $(TOPDIR)/vmlinux
-	gzip ${GZIP_FLAGS} <$(TOPDIR)/netboot | ./piggyback | $(AS) -o piggy.o
+zvmlinux: $(OBJECTS) $(SYSTEM) mkprep  find_name
+	mkprep $(TOPDIR)/vmlinux -|gzip ${GZIP_FLAGS}|mkprep -asm - -|$(AS) -o piggy.o
 	$(LD) $(ZLINKFLAGS) -o zvmlinux $(OBJECTS) piggy.o
-	rm -f piggy.o xx_boot
-
-head.o:	head.s
-
-head.s: head.S $(TOPDIR)/include/linux/tasks.h
-	$(CPP) -traditional head.S -o head.s
-
-piggyback: piggyback.c
-	$(HOSTCC) $(CFLAGS) -o piggyback piggyback.c
+	rm -f piggy.o
 
 clean:
-	rm -f piggyback zvmlinux mk_type41 mkprep mkboot
+	rm -f piggyback zvmlinux mk_type41 mkprep mkboot find_name
 	rm -f $(TOPDIR)/{zImage,znetboot,netboot}
 
+fastdep:
+	$(TOPDIR)/scripts/mkdep *.[Sch] > .depend
+
 dep:
+	$(CPP) -M *.S *.c > .depend
+

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov