diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-02-20 17:18:42 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-02-20 12:00:20 -0500 |
| commit | 3241e3d08c8e43b72e1c83fd44a2eb3bbbe511f8 (patch) | |
| tree | 54290a194ddae1641466211739c310ddb49ca38f | |
| parent | 39abd65c342a271d39fa580dc4c5cb7fce516ef3 (diff) | |
| download | u-boot-3241e3d08c8e43b72e1c83fd44a2eb3bbbe511f8.tar.gz u-boot-3241e3d08c8e43b72e1c83fd44a2eb3bbbe511f8.tar.bz2 u-boot-3241e3d08c8e43b72e1c83fd44a2eb3bbbe511f8.zip | |
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 <swarren@nvidia.com>
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@ti.com>
| -rw-r--r-- | arch/arm/dts/Makefile | 5 | ||||
| -rw-r--r-- | arch/arm/dts/tegra124-venice2.dts (renamed from board/nvidia/dts/tegra124-venice2.dts) | 0 |
2 files changed, 2 insertions, 3 deletions
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 index 2f8d1dcc37..2f8d1dcc37 100644 --- a/board/nvidia/dts/tegra124-venice2.dts +++ b/arch/arm/dts/tegra124-venice2.dts |