From 91f533b3c3818f839e07c7b847d4f2db1b59c8d9 Mon Sep 17 00:00:00 2001
From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Fri, 30 Nov 2007 16:24:07 +0100
Subject: [PATCH] --- yaml --- r: 84935 b: refs/heads/master c:
 3d6f7871ada50e607fe1dae64d2d726a6764451a h: refs/heads/master i:   84933:
 a16a1ed07af868ff416f47a3c410c6e8a29837f4   84931:
 e896dea2256710903b1ae74cb5968545b3440dce   84927:
 58a52fbbee7c15e6eb4b50ba63b44f55528d6f7e v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/cris/arch-v32/boot/Makefile | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 6ddbff9ec2d0..e1018a5c6521 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e4cc2c8c7cb54ce0e5a7002c68aca9e89607117
+refs/heads/master: 3d6f7871ada50e607fe1dae64d2d726a6764451a
diff --git a/trunk/arch/cris/arch-v32/boot/Makefile b/trunk/arch/cris/arch-v32/boot/Makefile
index 26f293ab9617..3f91349c5f12 100644
--- a/trunk/arch/cris/arch-v32/boot/Makefile
+++ b/trunk/arch/cris/arch-v32/boot/Makefile
@@ -1,14 +1,21 @@
 #
 # arch/cris/arch-v32/boot/Makefile
 #
-target = $(target_boot_dir)
-src    = $(src_boot_dir)
 
-zImage: compressed/vmlinuz
+OBJCOPY = objcopy-cris
+OBJCOPYFLAGS = -O binary -R .note -R .comment
 
-compressed/vmlinuz: $(objtree)/vmlinux
-	@$(MAKE) -f $(src)/compressed/Makefile $(objtree)/vmlinuz
+subdir- := compressed rescue
+targets := Image
 
-clean:
-	rm -f zImage tools/build compressed/vmlinux.out
-	@$(MAKE) -f $(src)/compressed/Makefile clean
+$(obj)/Image: vmlinux FORCE
+	$(call if_changed,objcopy)
+	@echo '  Kernel: $@ is ready'
+
+$(obj)/compressed/vmlinux: $(obj)/Image FORCE
+	$(Q)$(MAKE) $(build)=$(obj)/compressed $@
+	$(Q)$(MAKE) $(build)=$(obj)/rescue $(obj)/rescue/rescue.bin
+
+$(obj)/zImage:  $(obj)/compressed/vmlinux
+	@cp $< $@
+	@echo '  Kernel: $@ is ready'