diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-28 15:12:03 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-28 15:12:03 (GMT) |
| commit | 4f892924d238cc415891dbea336a0fdaff2f853b (patch) | |
| tree | 145882227f01a5092c656d1fc7122adff76bc8c2 /arch/arm/dts/Makefile | |
| parent | ec1eaad06551e2422baf8743f6987d4f561f2ce6 (diff) | |
| parent | 1c140f7bbf4a008fcd78b407ea80c60a2a18fc1f (diff) | |
| download | u-boot-4f892924d238cc415891dbea336a0fdaff2f853b.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
common/Kconfig
configs/dms-ba16_defconfig
Diffstat (limited to 'arch/arm/dts/Makefile')
| -rw-r--r-- | arch/arm/dts/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 8dbaea0..836a8c4 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -282,7 +282,9 @@ dtb-$(CONFIG_VF610) += vf500-colibri.dtb \ pcm052.dtb \ bk4r1.dtb -dtb-$(CONFIG_MX6) += imx6ull-14x14-evk.dtb +dtb-$(CONFIG_MX6) += imx6ull-14x14-evk.dtb \ + imx6dl-icore.dtb \ + imx6q-icore.dtb dtb-$(CONFIG_MX7) += imx7-colibri.dtb |