[ARM PATCH] 1684/1: Add uImage build target rule

Patch from George G. Davis

This adds an `make uImage` build target rule to create boot images for targets which use u-Boot firmware. This build target already exists for the PPC architecture.

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 5991263f6f62482536984e5e94e405f0d8725bf5..dcdd353b017406b865efbf271eae30da3db266bd 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -149,7 +149,7 @@ maketools: include/asm-arm/.arch \
 bzImage: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/zImage
 
-zImage Image bootpImage: vmlinux
+zImage Image bootpImage uImage: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
 zinstall install: vmlinux

diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index e087b89bd594618f62376e1d7a4f45ae427ac764..980d7f2d7a6dff4be167ca10243eb3c56a2146c8 100644 (file)
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -8,6 +8,8 @@
 # Copyright (C) 1995-2002 Russell King
 #
 
+MKIMAGE         := $(srctree)/scripts/mkuboot.sh
+
 # Note: the following conditions must always be true:
 #   ZRELADDR == virt_to_phys(TEXTADDR)
 #   PARAMS_PHYS must be with 4MB of ZRELADDR
@@ -78,6 +80,16 @@ $(obj)/zImage:       $(obj)/compressed/vmlinux FORCE
        $(call if_changed,objcopy)
        @echo '  Kernel: $@ is ready'
 
+quite_cmd_uimage = UIMAGE $@
+      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \
+                  -C none -a $(ZRELADDR) -e $(ZRELADDR) \
+                  -n 'Linux-$(KERNELRELEASE)' -d $< $@
+
+targets += uImage
+$(obj)/uImage: $(obj)/zImage
+       $(call if_changed,uimage)
+       @echo '  Image $@ is ready'
+
 $(obj)/bootpImage: $(obj)/bootp/bootp FORCE
        $(call if_changed,objcopy)
        @echo '  Kernel: $@ is ready'