From mboxrd@z Thu Jan  1 00:00:00 1970
From: arnd@arndb.de (Arnd Bergmann)
Date: Tue, 13 Jan 2015 13:23:06 +0100
Subject: [PATCH V2] ARM: dts: Only build dtb if associated Arch and/or SoC
 is enabled
In-Reply-To: <20150112224203.GL22090@quad.lixom.net>
References: <1419920427-29121-1-git-send-email-pbrobinson@gmail.com>
 <20150112224203.GL22090@quad.lixom.net>
Message-ID: <2841623.hUI7NQFVvE@wuerfel>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Monday 12 January 2015 14:42:03 Olof Johansson wrote:
> 
> I've applied this on next/dt now, hopefully it won't become too much of
> a headache of conflicts during this release cycle. At least doing it on that
> branch should keep us from exposing it up outside our tree.
> 

I had to add this snippet to get my local tree to build again:

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7be7a6f62d81..3308d110bdc7 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -303,7 +303,7 @@ dtb-$(CONFIG_SOC_IMX6SL) += \
 	imx6sl-evk.dtb
 dtb-$(CONFIG_SOC_IMX6SX) += \
 	imx6sx-sabreauto.dtb \
-	imx6sx-sdb.dtb \
+	imx6sx-sdb.dtb
 dtb-$(CONFIG_SOC_LS1021A) += \
 	ls1021a-qds.dtb \
 	ls1021a-twr.dtb

	Arnd