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

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

diff --git a/arch/cris/arch-v32/boot/rescue/Makefile 
b/arch/cris/arch-v32/boot/rescue/Makefile
dissimilarity index 76%
index f668a81..43260e7 100644
--- a/arch/cris/arch-v32/boot/rescue/Makefile
+++ b/arch/cris/arch-v32/boot/rescue/Makefile
@@ -1,36 +1,27 @@
-#
-# Makefile for rescue code
-#
-target = $(target_rescue_dir)
-src    = $(src_rescue_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
-
-all: $(target)/rescue.bin
-
-rescue: rescue.bin
-       # do nothing
-
-$(target)/rescue.bin: $(target) $(target)/head.o
-       $(LD) -T $(src)/rescue.ld -o $(target)/rescue.o $(target)/head.o
-       $(OBJCOPY) $(OBJCOPYFLAGS) $(target)/rescue.o $(target)/rescue.bin
-       cp -p $(target)/rescue.bin $(objtree)
-
-$(target):
-       mkdir -p $(target)
-
-$(target)/head.o: $(src)/head.S
-       $(CC) -D__ASSEMBLY__ -c $< -o $*.o
-
-clean:
-       rm -f $(target)/*.o $(target)/*.bin
-
-fastdep:
-
-modules:
-
-modules-install:
+#
+# Makefile for rescue (bootstrap) code
+#
+
+CC = gcc-cris -mlinux -march=v32 $(LINUXINCLUDE)
+EXTRA_CFLAGS = -O2
+AFLAGS += -I $(TOPDIR)/include/asm/arch/mach/ -I $(TOPDIR)/include/asm/arch
+EXTRA_CFLAGS += -I $(TOPDIR)/include/asm/arch/mach/ -I 
$(TOPDIR)/include/asm/arch
+LD = gcc-cris -mlinux -march=v32 -nostdlib
+LDFLAGS = -T $(obj)/rescue.ld
+LDPOSTFLAGS = -lgcc
+OBJCOPY = objcopy-cris
+OBJCOPYFLAGS = -O binary --remove-section=.bss
+obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o
+OBJECT := $(obj)/head.o
+
+targets := rescue.o rescue.bin
+
+quiet_cmd_ldlibgcc = LD      $@
+cmd_ldlibgcc = $(LD) $(LDFLAGS) $(filter-out FORCE,$^) $(LDPOSTFLAGS) -o $@
+
+$(obj)/rescue.o: $(OBJECTS) FORCE
+       $(call if_changed,ldlibgcc)
+
+$(obj)/rescue.bin: $(obj)/rescue.o FORCE
+       $(call if_changed,objcopy)
+       cp -p $(obj)/rescue.bin $(objtree)
-
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