diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-07-28 14:15:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-07-28 14:15:34 +0200 |
| commit | b99cfa66e118ef5535f18228a373a6e2d8fa4275 (patch) | |
| tree | 2fd64e3ec2d5a886b2036d521591c8db9b570cb4 /arch/arm/boot/dts/Makefile | |
| parent | 3fdef7e3bc6da0519eb1d76fa528ca088e12530e (diff) | |
| parent | b1db66b818a4cb1a654ae51a5ca32a09d1ccd825 (diff) | |
Merge tag 'v3.17-rockchip-rk3288' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Merge "Initial support for Rockchip RK3288 SoCs" from Heiko Stuebner:
* tag 'v3.17-rockchip-rk3288' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: Build dtbs for Rockchip boards
ARM: dts: add rk3288 evaluation board
ARM: dts: rockchip: add core rk3288 dtsi
ARM: rockchip: enable support for RK3288 SoCs
ARM: Kconfig: set default gpio number for rockchip SoCs
ARM: rockchip: add debug uart used by rk3288
ARM: rockchip: clarify usability of DEBUG_RK3X_UART debug_ll options
dt-bindings: arm: add cortex-a12 and cortex-a17 cpu compatible properties
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 55405b29761..31d90c5643b 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -344,6 +344,11 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-apq8084-mtp.dtb \ qcom-msm8660-surf.dtb \ qcom-msm8960-cdp.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += \ + rk3066a-bqcurie2.dtb \ + rk3188-radxarock.dtb \ + rk3288-evb-act8846.dtb \ + rk3288-evb-rk808.dtb dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \ s3c6410-smdk6410.dtb |