Patched in Tegra support.

1 files changed, 22 insertions, 20 deletions

diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index abfce280f57..a1edfd5a129 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -11,6 +11,8 @@
 # Copyright (C) 1995-2002 Russell King
 #
 
+MKIMAGE         := $(srctree)/scripts/mkuboot.sh
+
 ifneq ($(MACHINE),)
 include $(srctree)/$(MACHINE)/Makefile.boot
 endif
@@ -31,7 +33,7 @@ ifeq ($(CONFIG_XIP_KERNEL),y)
 
 $(obj)/xipImage: vmlinux FORCE
         $(call if_changed,objcopy)
-        @$(kecho) '  Kernel: $@ is ready (physical address: $(CONFIG_XIP_PHYS_ADDR))'
+        @echo '  Kernel: $@ is ready (physical address: $(CONFIG_XIP_PHYS_ADDR))'
 
 $(obj)/Image $(obj)/zImage: FORCE
         @echo 'Kernel configured for XIP (CONFIG_XIP_KERNEL=y)'
@@ -46,39 +48,39 @@ $(obj)/xipImage: FORCE
 
 $(obj)/Image: vmlinux FORCE
         $(call if_changed,objcopy)
-        @$(kecho) '  Kernel: $@ is ready'
+        @echo '  Kernel: $@ is ready'
 
 $(obj)/compressed/vmlinux: $(obj)/Image FORCE
         $(Q)$(MAKE) $(build)=$(obj)/compressed $@
 
 $(obj)/zImage:  $(obj)/compressed/vmlinux FORCE
         $(call if_changed,objcopy)
-        @$(kecho) '  Kernel: $@ is ready'
+        @echo '  Kernel: $@ is ready'
 
 endif
 
-ifneq ($(LOADADDR),)
-  UIMAGE_LOADADDR=$(LOADADDR)
+# Rule to build device tree blobs
+$(obj)/%.dtb: $(src)/dts/%.dts
+        $(call cmd,dtc)
+
+$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))
+
+quiet_cmd_uimage = UIMAGE  $@
+      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \
+                   -C none -a $(LOADADDR) -e $(STARTADDR) \
+                   -n 'Linux-$(KERNELRELEASE)' -d $< $@
+
+ifeq ($(CONFIG_ZBOOT_ROM),y)
+$(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)
 else
-  ifeq ($(CONFIG_ZBOOT_ROM),y)
-    UIMAGE_LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)
-  else
-    UIMAGE_LOADADDR=$(ZRELADDR)
-  endif
+$(obj)/uImage: LOADADDR=$(ZRELADDR)
 endif
 
-check_for_multiple_loadaddr = \
-if [ $(words $(UIMAGE_LOADADDR)) -gt 1 ]; then \
-        echo 'multiple load addresses: $(UIMAGE_LOADADDR)'; \
-        echo 'This is incompatible with uImages'; \
-        echo 'Specify LOADADDR on the commandline to build an uImage'; \
-        false; \
-fi
+$(obj)/uImage: STARTADDR=$(LOADADDR)
 
 $(obj)/uImage:  $(obj)/zImage FORCE
-        @$(check_for_multiple_loadaddr)
         $(call if_changed,uimage)
-        @$(kecho) '  Image $@ is ready'
+        @echo '  Image $@ is ready'
 
 $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
         $(Q)$(MAKE) $(build)=$(obj)/bootp $@
@@ -86,7 +88,7 @@ $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
 
 $(obj)/bootpImage: $(obj)/bootp/bootp FORCE
         $(call if_changed,objcopy)
-        @$(kecho) '  Kernel: $@ is ready'
+        @echo '  Kernel: $@ is ready'
 
 PHONY += initrd FORCE
 initrd: