Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge G. Davis <davis_g@com.rmk.(none)>2003-10-16 22:32:23 +0100
committerRussell King <rmk@flint.arm.linux.org.uk>2003-10-16 22:32:23 +0100
commitce432c93edb57b250f97ac64c15c33ccefa88454 (patch)
treef8e26b25cc35edda7afea20a6279d6f17107fd7e
parent01d259fe61c43fe659b9e94d098288c50bdc6c61 (diff)
[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.
-rw-r--r--arch/arm/Makefile2
-rw-r--r--arch/arm/boot/Makefile12
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 5991263f6f62..dcdd353b0174 100644
--- 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 e087b89bd594..980d7f2d7a6d 100644
--- 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'