summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-07-17 22:38:29 +0200
committerArnd Bergmann <arnd@arndb.de>2012-07-17 22:38:29 +0200
commit31a985f5bdc7e0708fc2cf02fac06c74664a7910 (patch)
tree93bbd283ad3d892597cdf1f0b4c8b2a502aeb97f
parent0e3585113f8fe31b7015d52ac94f56c8952626f7 (diff)
parenta44fccbc18889676fa3f6b44319ca55b32646284 (diff)
downloadlwn-31a985f5bdc7e0708fc2cf02fac06c74664a7910.tar.gz
lwn-31a985f5bdc7e0708fc2cf02fac06c74664a7910.zip
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>
-rw-r--r--arch/arm/mach-mvebu/Makefile.boot2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/Makefile.boot b/arch/arm/mach-mvebu/Makefile.boot
index b3271754e9fd..2579a2fc2334 100644
--- 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