diff options
author | Tom Rini <trini@konsulko.com> | 2016-06-06 13:24:23 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-06-06 13:39:43 -0400 |
commit | d77fa2ff766bbb4b867e791187f78b6033071613 (patch) | |
tree | b1116470884e46c0a66c49525771cf9b49c3835d /arch/arm/dts/Makefile | |
parent | 65eac4cc54921f9496061b0e0f0a7e159b42a3c6 (diff) | |
parent | 086e13c5f6f79a68246d6b803cf4736cb6815e44 (diff) |
Merge http://git.denx.de/u-boot-samsung
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/peach-pi_defconfig
configs/peach-pit_defconfig
Diffstat (limited to 'arch/arm/dts/Makefile')
-rw-r--r-- | arch/arm/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 1814797b1c3..a8276138ab1 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -21,6 +21,7 @@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \ exynos5420-peach-pit.dtb \ exynos5800-peach-pi.dtb \ exynos5422-odroidxu3.dtb +dtb-$(CONFIG_EXYNOS7420) += exynos7420-espresso7420.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-firefly.dtb \ rk3288-jerry.dtb \ |