Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=28bf739b127c0f0e893baf4efd97d218247d5d71
Commit:     28bf739b127c0f0e893baf4efd97d218247d5d71
Parent:     3d6f7871ada50e607fe1dae64d2d726a6764451a
Author:     Jesper Nilsson <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 12:52:51 2008 +0100
Committer:  Jesper Nilsson <[EMAIL PROTECTED]>
CommitDate: Fri Feb 8 11:06:26 2008 +0100

    CRIS v32: Update boot compressed Kbuild makefile.
    
    - Remove old specific targets, use more generic ones instead.
    - Use if_changed to avoid creating new images when no change.
    - Use KBUILD_CFLAGS instead of CFLAGS.
---
 arch/cris/arch-v32/boot/compressed/Makefile |   71 +++++++++++---------------
 1 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/arch/cris/arch-v32/boot/compressed/Makefile 
b/arch/cris/arch-v32/boot/compressed/Makefile
dissimilarity index 84%
index 609692f..900d858 100644
--- a/arch/cris/arch-v32/boot/compressed/Makefile
+++ b/arch/cris/arch-v32/boot/compressed/Makefile
@@ -1,41 +1,30 @@
-#
-# lx25/arch/cris/arch-v32/boot/compressed/Makefile
-#
-# create a compressed vmlinux image from the original vmlinux files and romfs
-#
-
-target = $(target_compressed_dir)
-src    = $(src_compressed_dir)
-
-CC = gcc-cris -mlinux -march=v32 $(LINUXINCLUDE)
-CFLAGS = -O2
-LD = gcc-cris -mlinux -march=v32 -nostdlib
-OBJCOPY = objcopy-cris
-OBJCOPYFLAGS = -O binary --remove-section=.bss
-OBJECTS = $(target)/head.o $(target)/misc.o
-
-# files to compress
-SYSTEM = $(objtree)/vmlinux.bin
-
-all: vmlinuz
-
-$(target)/decompress.bin: $(OBJECTS)
-       $(LD) -T $(src)/decompress.ld -o $(target)/decompress.o $(OBJECTS)
-       $(OBJCOPY) $(OBJCOPYFLAGS) $(target)/decompress.o 
$(target)/decompress.bin
-
-$(objtree)/vmlinuz: $(target) piggy.img $(target)/decompress.bin
-       cat $(target)/decompress.bin piggy.img > $(objtree)/vmlinuz
-       rm -f piggy.img
-       cp $(objtree)/vmlinuz $(src)
-
-$(target)/head.o: $(src)/head.S
-       $(CC) -D__ASSEMBLY__ -c $< -o $@
-
-# gzip the kernel image
-
-piggy.img: $(SYSTEM)
-       cat $(SYSTEM) | gzip -f -9 > piggy.img
-
-clean:
-       rm -f piggy.img $(objtree)/vmlinuz vmlinuz.o decompress.o 
decompress.bin $(OBJECTS)
-
+#
+# arch/cris/arch-v32/boot/compressed/Makefile
+#
+
+CC = gcc-cris -mlinux -march=v32 $(LINUXINCLUDE)
+AFLAGS += -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch
+KBUILD_CFLAGS += -O2 -I $(srctree)/include/asm/mach/ -I 
$(srctree)/include/asm/arch
+LD = gcc-cris -mlinux -march=v32 -nostdlib
+LDFLAGS = -T $(obj)/decompress.ld
+obj-y = head.o misc.o
+OBJECTS = $(obj)/head.o $(obj)/misc.o
+OBJCOPY = objcopy-cris
+OBJCOPYFLAGS = -O binary --remove-section=.bss
+
+quiet_cmd_image = BUILD   $@
+cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
+
+targets := vmlinux piggy.gz decompress.o decompress.bin
+
+$(obj)/decompress.o: $(OBJECTS) FORCE
+       $(call if_changed,ld)
+
+$(obj)/decompress.bin: $(obj)/decompress.o FORCE
+       $(call if_changed,objcopy)
+
+$(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE
+       $(call if_changed,image)
+
+$(obj)/piggy.gz: $(obj)/../Image FORCE
+       $(call if_changed,gzip)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to