From eb458ef8d7c59fc85fa689689d966d3cec47770f Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@lunn.ch>
Date: Thu, 6 Sep 2012 18:09:33 +0100
Subject: [PATCH] --- yaml --- r: 331490 b: refs/heads/master c:
 e50a622deaf6b1a7dd2b9fb60975dd1d5406db37 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/arch/arm/Makefile | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ae7e6c5f4581..9ae889b054e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a761cebfd7cbeaf9a3a0c6960508ca1daaebb67e
+refs/heads/master: e50a622deaf6b1a7dd2b9fb60975dd1d5406db37
diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile
index 30eae87ead6d..0457ef4d8c86 100644
--- a/trunk/arch/arm/Makefile
+++ b/trunk/arch/arm/Makefile
@@ -268,7 +268,12 @@ else
 KBUILD_IMAGE := zImage
 endif
 
-all:	$(KBUILD_IMAGE)
+# Build the DT binary blobs if we have OF configured
+ifeq ($(CONFIG_USE_OF),y)
+KBUILD_DTBS := dtbs
+endif
+
+all:	$(KBUILD_IMAGE) $(KBUILD_DTBS)
 
 boot := arch/arm/boot
 
@@ -306,7 +311,7 @@ define archhelp
   echo  '  uImage        - U-Boot wrapped zImage'
   echo  '  bootpImage    - Combined zImage and initial RAM disk' 
   echo  '                  (supply initrd image via make variable INITRD=<path>)'
-  echo  '  dtbs          - Build device tree blobs for enabled boards'
+  echo  '* dtbs          - Build device tree blobs for enabled boards'
   echo  '  install       - Install uncompressed kernel'
   echo  '  zinstall      - Install compressed kernel'
   echo  '  uinstall      - Install U-Boot wrapped compressed kernel'