Skip to contentSkip to conversation

venice2: move device tree to fix build error

PATCH New Masahiro Yamada 4 participants 5 messages Feb 20, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.)

Cc Stephen Warren <[email protected]>
Cc Simon Glass <[email protected]>
Cc Tom Rini <[email protected]>
---
 arch/arm/dts/Makefile                 |  5 +--
 arch/arm/dts/tegra124-venice2.dts     | 84 +++++++++++++++++++++++++++++++++++
 board/nvidia/dts/tegra124-venice2.dts | 84 -----------------------------------
 3 files changed, 86 insertions(+), 87 deletions(-)
 create mode 100644 arch/arm/dts/tegra124-venice2.dts
 delete mode 100644 board/nvidia/dts/tegra124-venice2.dts
arch/arm/dts/Makefile +2 -3
index 2658911..e2fcca5 100644
@@ -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 \
arch/arm/dts/tegra124-venice2.dts new file +84 -0

84 lines not on this page · raw message

board/nvidia/dts/tegra124-venice2.dts deleted +0 -84

84 lines not on this page · raw message

Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 venice2: move device tree to fix build error

Quoted 7 lines · Masahiro Yamada

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.)

Since all the other DTS have moved likewise,

(although not that Tom Warren is the Tegra U-Boot maintainer).

Quoted 3 lines
 arch/arm/dts/Makefile                 |  5 +--
 arch/arm/dts/tegra124-venice2.dts     | 84 +++++++++++++++++++++++++++++++++++
 board/nvidia/dts/tegra124-venice2.dts | 84 -----------------------------------

I'm assuming the file was moved with zero changes. "git format-patch -M" would have been useful to make this clear.

#2 lore raw

PATCH 1/1 venice2: move device tree to fix build error

This fixes the MAKEALL -s tegra build break I saw this morning when I rebased u-boot-tegra/next against ARM master. Thanks.

TomR - will you take this into U-Boot master?

Tom

Quoted 20 lines

-----Original Message-----
From: Stephen Warren [mailto:swarren at wwwdotorg.org]
Sent: Thursday, February 20, 2014 9:18 AM
To: Masahiro Yamada; u-boot at lists.denx.de
Cc: Tom Rini; Stephen Warren; Tom Warren
Subject: Re: [U-Boot] [PATCH] venice2: move device tree to fix build error

Quoted 6 lines · Masahiro Yamada

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.)

Since all the other DTS have moved likewise,

(although not that Tom Warren is the Tegra U-Boot maintainer).

Quoted 8 lines
Quoted 2 lines
 arch/arm/dts/Makefile                 |  5 +--
 arch/arm/dts/tegra124-venice2.dts     | 84

+++++++++++++++++++++++++++++++++++

Quoted 2 lines
 board/nvidia/dts/tegra124-venice2.dts | 84

-----------------------------------

I'm assuming the file was moved with zero changes. "git format-patch -M" would have been useful to make this clear.

--
nvpublic

#3 lore raw

PATCH 1/1 venice2: move device tree to fix build error

Quoted 3 lines · Tom Warren

This fixes the MAKEALL -s tegra build break I saw this morning when I rebased u-boot-tegra/next against ARM master. Thanks.

TomR - will you take this into U-Boot master?

Yup, I've already got it queued along with the i2c PR and a few other small things.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140220/f12bdd00/attachment.pgp>
#4 lore raw

PATCH 1/1 venice2: move device tree to fix build error

In reply to Masahiro Yamada
Quoted 5 lines · Masahiro Yamada

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.

Quoted 7 lines

(Commit 5ab502cb had been posted before venice2 board support was merged. So an unvisible conflict happened.)

Cc Stephen Warren <[email protected]>
Cc Simon Glass <[email protected]>
Cc Tom Rini <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140220/a7580528/attachment.pgp>