patch-2.4.0-test2 linux/arch/ppc/chrpboot/Makefile

• Lines: 76
• Date: Mon Jun 19 17:59:35 2000
• Orig file: v2.4.0-test1/linux/arch/ppc/chrpboot/Makefile
• Orig date: Tue Apr 11 15:09:13 2000

diff -u --recursive --new-file v2.4.0-test1/linux/arch/ppc/chrpboot/Makefile linux/arch/ppc/chrpboot/Makefile
@@ -5,29 +5,24 @@
 #
 # Based on coffboot by Paul Mackerras
 
-.c.s:
-	$(CC) $(CFLAGS) -S -o $*.s $<
-.s.o:
-	$(AS) -o $*.o $<
+ifeq ($(CONFIG_PPC64BRIDGE),y)
+MSIZE=.64
+AFLAGS += -Wa,-mppc64bridge
+else
+MSIZE=
+endif
+
 .c.o:
 	$(CC) $(CFLAGS) -DKERNELBASE=$(KERNELBASE) -c -o $*.o $<
-.S.s:
-	$(CPP) $(AFLAGS) -traditional -o $*.o $<
 .S.o:
 	$(CC) $(AFLAGS) -traditional -c -o $*.o $<
 
 CFLAGS	= $(CPPFLAGS) -O -fno-builtin -DSTDC_HEADERS
 LD_ARGS = -Ttext 0x00400000
 
-OBJS = crt0.o start.o main.o misc.o ../coffboot/string.o ../coffboot/zlib.o image.o sysmap.o
+OBJS = crt0.o start.o main.o misc.o ../coffboot/string.o ../coffboot/zlib.o image.o
 LIBS = $(TOPDIR)/lib/lib.a
 
-ifeq ($(CONFIG_PPC64),y)
-MSIZE=.64
-else
-MSIZE=
-endif
-
 ifeq ($(CONFIG_ALL_PPC),y)
 # yes, we want to build chrp stuff
 CONFIG_CHRP = y
@@ -58,8 +53,8 @@
 piggyback: piggyback.c
 	$(HOSTCC) $(HOSTCFLAGS) -DKERNELBASE=$(KERNELBASE) -o piggyback piggyback.c
 
-mknote: mknote.c
-	$(HOSTCC) $(HOSTCFLAGS) -o mknote mknote.c
+addnote: addnote.c
+	$(HOSTCC) $(HOSTCFLAGS) -o addnote addnote.c
 
 image.o: piggyback ../coffboot/vmlinux.gz
 	./piggyback image < ../coffboot/vmlinux.gz | $(AS) -o image.o
@@ -70,13 +65,13 @@
 initrd.o: ramdisk.image.gz piggyback
 	./piggyback initrd < ramdisk.image.gz | $(AS) -o initrd.o
 
-zImage: $(OBJS) no_initrd.o mknote
+zImage: $(OBJS) no_initrd.o addnote
 	$(LD) $(LD_ARGS) -o $@ $(OBJS) no_initrd.o $(LIBS)
-	./mknote > note
-	$(OBJCOPY) $@ $@ --add-section=.note=note -R .comment
+	./addnote $@
 
-zImage.initrd: $(OBJS) initrd.o
+zImage.initrd: $(OBJS) initrd.o addnote
 	$(LD) $(LD_ARGS) -o $@ $(OBJS) initrd.o $(LIBS)
+	./addnote $@
 
 else
 znetboot:
@@ -98,7 +93,7 @@
 
 
 clean:
-	rm -f piggyback note mknote $(OBJS) zImage
+	rm -f piggyback note addnote $(OBJS) zImage
 
 fastdep:
 	$(TOPDIR)/scripts/mkdep *.[Sch] > .depend