From 3241e3d08c8e43b72e1c83fd44a2eb3bbbe511f8 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 20 Feb 2014 17:18:42 +0900 Subject: [PATCH] venice2: move device tree to fix build error Commit 5ab502cb gathered all device tree sources to arch/$(ARCH)/dts/. So tegra124-venice2.dts also must go to arch/arm/dts directory to build venice2 board. (Commit 5ab502cb had been posted before venice2 board support was merged. So an unvisible conflict happened.) Acked-by: Stephen Warren Signed-off-by: Masahiro Yamada Cc: Simon Glass Cc: Tom Rini --- arch/arm/dts/Makefile | 5 ++--- {board/nvidia => arch/arm}/dts/tegra124-venice2.dts | 0 2 files changed, 2 insertions(+), 3 deletions(-) rename {board/nvidia => arch/arm}/dts/tegra124-venice2.dts (100%) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 2658911ca1..e2fcca5670 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -2,7 +2,6 @@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \ exynos5250-snow.dtb \ exynos5250-smdk5250.dtb \ exynos5420-smdk5420.dtb - dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \ tegra20-medcom-wide.dtb \ tegra20-paz00.dtb \ @@ -16,8 +15,8 @@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \ tegra30-beaver.dtb \ tegra30-cardhu.dtb \ tegra30-tec-ng.dtb \ - tegra114-dalmore.dtb - + tegra114-dalmore.dtb \ + tegra124-venice2.dtb dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \ zynq-zc706.dtb \ zynq-zed.dtb \ diff --git a/board/nvidia/dts/tegra124-venice2.dts b/arch/arm/dts/tegra124-venice2.dts similarity index 100% rename from board/nvidia/dts/tegra124-venice2.dts rename to arch/arm/dts/tegra124-venice2.dts -- 2.25.1