diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 17:57:25 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 17:57:25 +0200 |
| commit | e3b897c1ae5341daa6f00ef9b70bc7e44f3b1705 (patch) | |
| tree | e030f3d3d82e4e5036b8ddace57738af112e7110 /arch/arm/mach-mxs/Makefile.boot | |
| parent | 8d5776d5fed6c3d2d5b5bce9512faa41321d6a8a (diff) | |
| parent | 5da0127093efb47c61e48d0af3d6ef0762aac00b (diff) | |
Merge branch 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
From Shawn Guo <shawn.guo@linaro.org>:
Here is the second (last) batch of mxs mxs device tree changes for 3.6.
* 'mxs/dt-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: dts: imx28-evk: add usb devices
ARM: mxs: rename dts files with soc name being the prefix
ARM: apx4devkit: add pin muxing for GPIOs
ARM: apx4devkit: remove AUART3
ARM: apx4devkit: add SSP2 support
ARM: apx4devkit: fix the bus-width of SSP0 to 4 bits
ARM: apx4devkit: add display support
ARM: apx4devkit: add NAND support
ARM: mxs: add dtb-y target into Makefile.boot
ARM: mxs: convert stmp378x_devb board to device tree
ARM: mxs: convert tx28 board to device tree
ARM: mxs: convert apx4devkit board to device tree
ARM: mxs: convert m28evk board to device tree
ARM: dts: imx28: move lcdif control pins into board dts
ARM: dts: imx28: move extra gpmi-nand pins into board dts
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mxs/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-mxs/Makefile.boot | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/Makefile.boot b/arch/arm/mach-mxs/Makefile.boot index 07b11fe6453..4582999cf08 100644 --- a/arch/arm/mach-mxs/Makefile.boot +++ b/arch/arm/mach-mxs/Makefile.boot @@ -1 +1,10 @@ zreladdr-y += 0x40008000 + +dtb-y += imx23-evk.dtb \ + imx23-olinuxino.dtb \ + imx23-stmp378x_devb.dtb \ + imx28-apx4devkit.dtb \ + imx28-cfa10036.dtb \ + imx28-evk.dtb \ + imx28-m28evk.dtb \ + imx28-tx28.dtb \ |