diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-29 18:35:33 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-29 18:35:42 +0100 |
| commit | a6f243a4d6cbc9d7b0f63dcf7eb1e79f08880553 (patch) | |
| tree | bb47e613d17083e90d067a81a9b56b2f28a8d0e8 /arch/arm/boot/dts/Makefile | |
| parent | Merge branch 'depends/cleanup' into next/dt (diff) | |
| parent | ARM: nomadik: get rid of <mach/hardware.h> (diff) | |
| download | linux-a6f243a4d6cbc9d7b0f63dcf7eb1e79f08880553.tar.xz linux-a6f243a4d6cbc9d7b0f63dcf7eb1e79f08880553.zip | |
Merge tag 'nmk-dt-on-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt
From Linus Walleij:
Nomadik Device Tree conversion rebased on ARM SoC cleanup branch
This patch set converts the Nomadik (mach-nomadik) to
Device Tree and delete the old board files, paving the
road for single zImage.
* tag 'nmk-dt-on-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: nomadik: get rid of <mach/hardware.h>
ARM: nomadik: delete old board files
ARM: nomadik: add I2C devices to the device tree
ARM: nomadik: migrate MMC/SD card support to device tree
ARM: nomadik: convert SMSC91x ethernet to device tree
ARM: nomadik: move GPIO and pinctrl to device tree
ARM: nomadik: add FSMC NAND
ARM: nomadik: move remaining PrimeCells to device tree
ARM: nomadik: move pin maps to cpu file
ARM: nomadik: initial devicetree support
ARM: nomadik: move last custom calls to pinctrl
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5ebb44fe826a..3d115dcb3461 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -100,6 +100,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ imx28-m28evk.dtb \ imx28-sps1.dtb \ imx28-tx28.dtb +dtb-$(CONFIG_ARCH_NOMADIK) += ste-nomadik-s8815.dtb dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ omap3-beagle.dtb \ omap3-beagle-xm.dtb \ |