Merge branch 'mvebu/newsoc' into next/newsoc

One more addition from Thomas Petazzoni: * mvebu/newsoc: arm: mvebu: generate DTBs for supported SoCs Signed-off-by: Arnd Bergmann <arnd@arndb.de>
git-mirror · Jul 17, 2012 · 31a985f · 31a985f
2 parents 0e35851 + a44fccb
commit 31a985f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/arch/arm/mach-mvebu/Makefile.boot b/arch/arm/mach-mvebu/Makefile.boot
@@ -1 +1,3 @@
 zreladdr-y := 0x00008000
+dtb-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-db.dtb
+dtb-$(CONFIG_MACH_ARMADA_370_XP) += armada-xp-db.dtb