patch-2.4.7 linux/arch/ppc/boot/prep/Makefile

• Lines: 106
• Date: Thu Jul 19 18:11:13 2001
• Orig file: v2.4.6/linux/arch/ppc/boot/prep/Makefile
• Orig date: Tue Jul 3 17:08:18 2001

diff -u --recursive --new-file v2.4.6/linux/arch/ppc/boot/prep/Makefile linux/arch/ppc/boot/prep/Makefile
@@ -1,4 +1,4 @@
-# BK Id: SCCS/s.Makefile 1.17 06/12/01 16:47:44 paulus
+# BK Id: SCCS/s.Makefile 1.19 07/19/01 09:11:28 trini
 #
 # arch/ppc/boot/Makefile
 #
@@ -15,41 +15,30 @@
 # modified by Cort (cort@cs.nmt.edu)
 #
 
-.c.s:
-	$(CC) $(CFLAGS) -S -o $*.s $<
-.s.o:
-	$(AS) -o $*.o $<
-.c.o:
-	$(CC) $(CFLAGS) -c -o $*.o $<
-.S.s:
-	$(CPP) $(AFLAGS) -traditional -o $*.o $<
-.S.o:
-	$(CC) $(AFLAGS) -traditional -c -o $*.o $<
+USE_STANDARD_AS_RULE		:= true
+
+CFLAGS				+= -fno-builtin
 
 ifeq ($(CONFIG_SMP),y)
-TFTPIMAGE=/tftpboot/zImage.prep.smp
+TFTPIMAGE			= /tftpboot/zImage.prep.smp
 else
-TFTPIMAGE=/tftpboot/zImage.prep
+TFTPIMAGE			= /tftpboot/zImage.prep
 endif
 
-ZLINKFLAGS = -T $(TOPDIR)/arch/$(ARCH)/vmlinux.lds -Ttext 0x00800000
-OBJECTS := head.o misc.o ../common/misc-common.o \
-		../common/string.o of1275.o
-OBJCOPY_ARGS = -O elf32-powerpc
-LIBS = ../lib/zlib.a
-
-ifeq ($(CONFIG_SERIAL_CONSOLE),y)
-OBJECTS += ns16550.o
-endif
+ZLINKFLAGS			= -T $(TOPDIR)/arch/$(ARCH)/vmlinux.lds \
+					-Ttext 0x00800000
+obj-y				:= head.o misc.o ../common/misc-common.o \
+					../common/string.o of1275.o
+OBJCOPY_ARGS			= -O elf32-powerpc
+LIBS 				= ../lib/zlib.a
 
-ifeq ($(CONFIG_VGA_CONSOLE),y)
-OBJECTS += vreset.o kbd.o
-endif
+obj-$(CONFIG_SERIAL_CONSOLE)	+= ns16550.o
+obj-$(CONFIG_VGA_CONSOLE)	+= vreset.o kbd.o
 
 # Tools
-MKPREP := ../utils/mkprep
-SIZE := ../utils/size
-OFFSET := ../utils/offset
+MKPREP				:= ../utils/mkprep
+SIZE				:= ../utils/size
+OFFSET				:= ../utils/offset
 
 all:	zImage
 
@@ -61,7 +50,7 @@
 	$(CC) $(CFLAGS) -DIOOFFSET=0x80000000 -c -o $@ ../common/$*.c
 
 zvmlinux.initrd: zvmlinux ../images/vmlinux.gz
-	$(LD) $(ZLINKFLAGS) -o $@.tmp $(OBJECTS) $(LIBS)
+	$(LD) $(ZLINKFLAGS) -o $@.tmp $(obj-y) $(LIBS)
 	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
 		--add-section=initrd=../images/ramdisk.image.gz \
 		--add-section=image=../images/vmlinux.gz \
@@ -71,7 +60,7 @@
 		-DZIMAGE_OFFSET=`sh $(OFFSET) $(OBJDUMP) $@ image` \
 		-DZIMAGE_SIZE=`sh $(SIZE) $(OBJDUMP) $@ image` \
 		-c -o misc.o misc.c
-	$(LD) $(ZLINKFLAGS) -o $@.tmp $(OBJECTS) $(LIBS)
+	$(LD) $(ZLINKFLAGS) -o $@.tmp $(obj-y) $(LIBS)
 	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
 		--add-section=initrd=../images/ramdisk.image.gz \
 		--add-section=image=../images/vmlinux.gz \
@@ -86,12 +75,12 @@
 	$(MKPREP) -pbp zvmlinux.initrd ../images/$@.prep
 	rm -f zvmlinux.initrd
 
-zvmlinux: $(OBJECTS) $(LIBS) ../images/vmlinux.gz
+zvmlinux: $(obj-y) $(LIBS) ../images/vmlinux.gz
 #
 # build the boot loader image and then compute the offset into it
 # for the kernel image
 #
-	$(LD) $(ZLINKFLAGS) -o zvmlinux.tmp $(OBJECTS) $(LIBS)
+	$(LD) $(ZLINKFLAGS) -o zvmlinux.tmp $(obj-y) $(LIBS)
 	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
 		--add-section=image=../images/vmlinux.gz zvmlinux.tmp $@
 #
@@ -101,7 +90,7 @@
 		-DZIMAGE_OFFSET=`sh $(OFFSET) $(OBJDUMP) zvmlinux image` \
 		-DZIMAGE_SIZE=`sh $(SIZE) $(OBJDUMP) zvmlinux image` \
 		-c -o misc.o misc.c
-	$(LD) $(ZLINKFLAGS) -o zvmlinux.tmp $(OBJECTS) $(LIBS)
+	$(LD) $(ZLINKFLAGS) -o zvmlinux.tmp $(obj-y) $(LIBS)
 	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
 		--add-section=image=../images/vmlinux.gz $@.tmp $@
 	rm $@.tmp