diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-17 22:38:29 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-17 22:38:29 +0200 |
commit | 31a985f5bdc7e0708fc2cf02fac06c74664a7910 (patch) | |
tree | 93bbd283ad3d892597cdf1f0b4c8b2a502aeb97f /arch/arm | |
parent | 0e3585113f8fe31b7015d52ac94f56c8952626f7 (diff) | |
parent | a44fccbc18889676fa3f6b44319ca55b32646284 (diff) | |
download | op-kernel-dev-31a985f5bdc7e0708fc2cf02fac06c74664a7910.zip op-kernel-dev-31a985f5bdc7e0708fc2cf02fac06c74664a7910.tar.gz |
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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-mvebu/Makefile.boot | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/Makefile.boot b/arch/arm/mach-mvebu/Makefile.boot index b327175..2579a2f 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 |