diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-21 10:52:05 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-21 10:52:44 -0800 |
| commit | e9f6d13513ea9fd33b0184db8fc33cf51baa584b (patch) | |
| tree | 281401f6a868b888e30465eac233e084ed6d8bb3 /arch/arm/boot/dts/Makefile | |
| parent | 41739b60b3c00e0591d1a413276ddfa0d0b1ea89 (diff) | |
| parent | 67bea88dd842deb3ed8327ad101970dbd615ddcb (diff) | |
| download | op-kernel-dev-e9f6d13513ea9fd33b0184db8fc33cf51baa584b.zip op-kernel-dev-e9f6d13513ea9fd33b0184db8fc33cf51baa584b.tar.gz | |
Merge branch 'sunxi/soc2' into next/soc
From Maxime Ripard:
Here is a pull request to add the support for Allwinner A10 SoCs.
* sunxi/soc2:
ARM: sunxi: Add sunxi restart function via onchip watchdog
ARM: sunxi: Add sun4i and cubieboard support
ARM: sunxi: Add earlyprintk support for UART0 (sun4i)
ARM: sunxi: Restructure sunxi dts/dtsi files
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 22e4ac9..8585bc0 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -86,7 +86,8 @@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \ spear310-evb.dtb \ spear320-evb.dtb dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb -dtb-$(CONFIG_ARCH_SUNXI) += sun5i-olinuxino.dtb +dtb-$(CONFIG_ARCH_SUNXI) += sun4i-cubieboard.dtb \ + sun5i-olinuxino.dtb dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ tegra20-medcom-wide.dtb \ tegra20-paz00.dtb \ |
