diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-13 18:41:15 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-13 18:41:15 +0300 |
| commit | 971b4c6e1a827e2b01738772a2a7cfd8b0842286 (patch) | |
| tree | db5cfa46f38259904e2bf5d17dc0e119d88d3f33 /arch/arm/boot/dts/Makefile | |
| parent | 83a9660af6cf96b44c87a0312be2d2cae7640544 (diff) | |
| parent | b4e54510b51ae666ed7cef291bba0f86ad3d8e20 (diff) | |
| download | linux-971b4c6e1a827e2b01738772a2a7cfd8b0842286.tar.xz | |
Merge tag 'realview-dts-split' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/dt
Pull "RealView DTS file fixup and split" from Linus Walleij:
Fix the ethernet issue on revision D of the RealView EB
Split the DTS files in per-revision variants
* tag 'realview-dts-split' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: dts: add RealView EB rev D A9 MPCore variant
ARM: dts: split RealView EB 11MPCore variants
ARM: dts: add device tree for the RealView EB Rev D
ARM: dts: fix RealView EB SMSC ethernet version
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 7edcf006b739..e9d5c984db2c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -609,9 +609,13 @@ dtb-$(CONFIG_ARCH_REALVIEW) += \ arm-realview-pb1176.dtb \ arm-realview-pb11mp.dtb \ arm-realview-eb.dtb \ + arm-realview-eb-bbrevd.dtb \ arm-realview-eb-11mp.dtb \ - arm-realview-eb-11mp-revb.dtb \ + arm-realview-eb-11mp-bbrevd.dtb \ + arm-realview-eb-11mp-ctrevb.dtb \ + arm-realview-eb-11mp-bbrevd-ctrevb.dtb \ arm-realview-eb-a9mp.dtb \ + arm-realview-eb-a9mp-bbrevd.dtb \ arm-realview-pba8.dtb \ arm-realview-pbx-a9.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += \ |