Skip to contentSkip to conversation

Makefile: Prioritize external dtb if defined

PATCH New Michal Simek 4 participants 8 messages Mar 25, 2019 – May 20, 2019 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Makefile: Prioritize external dtb if defined

Prioritize external dtb if its passed via EXT_DTB than the dtb that was built in the tree. With this patch it appends the specified external dtb to the u-boot image.

---

 Makefile | 5 +++++
 1 file changed, 5 insertions(+)
Makefile +5 -0
index c1af9307b38e..83da41d87d6e 100644
@@ -1020,8 +1020,13 @@ MKIMAGEFLAGS_fit-dtb.blob = -f auto -A $(ARCH) -T firmware -C none -O u-boot \
 	-a 0 -e 0 -E \
 	$(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) -d /dev/null
 
+ifneq ($(EXT_DTB),)
+u-boot-fit-dtb.bin: u-boot-nodtb.bin $(EXT_DTB)
+		$(call if_changed,cat)
+else
 u-boot-fit-dtb.bin: u-boot-nodtb.bin fit-dtb.blob
 	$(call if_changed,cat)
+endif
 
 u-boot.bin: u-boot-fit-dtb.bin FORCE
 	$(call if_changed,copy)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 Makefile: Prioritize external dtb if defined

Quoted 6 lines · Michal Simek

Prioritize external dtb if its passed via EXT_DTB than the dtb that was built in the tree. With this patch it appends the specified external dtb to the u-boot image.

Quoted 6 lines

---

 Makefile | 5 +++++
 1 file changed, 5 insertions(+)
#2 lore raw

PATCH 1/1 Makefile: Prioritize external dtb if defined

In reply to Michal Simek
Quoted 8 lines · Michal Simek

Prioritize external dtb if its passed via EXT_DTB than the dtb that was built in the tree. With this patch it appends the specified external dtb to the u-boot image.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190519/97c6e194/attachment.sig>
#3 lore raw

PATCH 1/1 Makefile: Prioritize external dtb if defined

Quoted 7 lines · Tom Rini
Quoted 5 lines · Michal Simek

Prioritize external dtb if its passed via EXT_DTB than the dtb that was built in the tree. With this patch it appends the specified external dtb to the u-boot image.

Quoted 5 lines
Quoted 3 lines

Applied to u-boot/master, thanks!

The R-Car Gen3 boards (r8a779{5,6}*_salvator-x_defconfig) u-boot.bin size grew from 986 kiB to 1240 kiB with this patch, rendering the boards unbootable. I expect there to be more such cases, so please revert until there's new version which has this fixed.

Signature · 2 lines
Best regards,
Marek Vasut
#4 lore raw

PATCH 1/1 Makefile: Prioritize external dtb if defined

Quoted 12 lines · Marek Vasut
Quoted 11 lines · Tom Rini
Quoted 8 lines · Michal Simek

Prioritize external dtb if its passed via EXT_DTB than the dtb that was built in the tree. With this patch it appends the specified external dtb to the u-boot image.

Quoted 6 lines
Quoted 1 line

Applied to u-boot/master, thanks!

The R-Car Gen3 boards (r8a779{5,6}*_salvator-x_defconfig) u-boot.bin size grew from 986 kiB to 1240 kiB with this patch, rendering the boards unbootable. I expect there to be more such cases, so please revert until there's new version which has this fixed.

I must have messed something up when re-adjusting this to apply to top of tree. I'll revert this, thanks for reporting. Michal, please rebase the original patch and resend, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190519/15196cea/attachment.sig>
#5 lore raw

PATCH 1/1 Makefile: Prioritize external dtb if defined

Quoted 15 lines · Tom Rini
Quoted 14 lines · Marek Vasut
Quoted 12 lines · Tom Rini
Quoted 8 lines · Michal Simek

Prioritize external dtb if its passed via EXT_DTB than the dtb that was built in the tree. With this patch it appends the specified external dtb to the u-boot image.

Applied to u-boot/master, thanks!

Quoted 8 lines
Quoted 4 lines

The R-Car Gen3 boards (r8a779{5,6}*_salvator-x_defconfig) u-boot.bin size grew from 986 kiB to 1240 kiB with this patch, rendering the boards unbootable. I expect there to be more such cases, so please revert until there's new version which has this fixed.

I must have messed something up when re-adjusting this to apply to top of tree. I'll revert this, thanks for reporting. Michal, please rebase the original patch and resend, thanks!

My guess is that it has to do with the LZO compression of the DTBs on Gen3 , that fit-blob.itb is probably appended uncompressed or something.

Signature · 2 lines
Best regards,
Marek Vasut
#6 lore raw

PATCH 1/1 Makefile: Prioritize external dtb if defined

Quoted 21 lines · Marek Vasut
Quoted 20 lines · Tom Rini
Quoted 18 lines · Marek Vasut
Quoted 7 lines · Tom Rini
Quoted 5 lines · Michal Simek

Prioritize external dtb if its passed via EXT_DTB than the dtb that was built in the tree. With this patch it appends the specified external dtb to the u-boot image.

Quoted 5 lines
Quoted 3 lines

Applied to u-boot/master, thanks!

The R-Car Gen3 boards (r8a779{5,6}*_salvator-x_defconfig) u-boot.bin size grew from 986 kiB to 1240 kiB with this patch, rendering the boards unbootable. I expect there to be more such cases, so please revert until there's new version which has this fixed.

Quoted 7 lines
Quoted 3 lines

I must have messed something up when re-adjusting this to apply to top of tree. I'll revert this, thanks for reporting. Michal, please rebase the original patch and resend, thanks!

My guess is that it has to do with the LZO compression of the DTBs on Gen3 , that fit-blob.itb is probably appended uncompressed or something.

This patch is already applied to the tree (commit below). It means you please revert what was added by: 3eaf6dcd9362b56e3217559401287dd8fa35b5b2

Thanks,
Michal

commit c8c5e2b84d5d928472b68a51854b727ee90295b2

Author:     Michal Simek <[email protected]>
AuthorDate: Sat Mar 23 11:13:00 2019 +0530
Commit:     Michal Simek <[email protected]>
CommitDate: Tue Apr 16 11:52:02 2019 +0200

Makefile: Prioritize external dtb if defined

Prioritize external dtb if its passed via EXT_DTB than the dtb that was built in the tree. With this patch it appends the specified external dtb to the u-boot image.

Signed-off-by Siva Durga Prasad Paladugu

<[email protected]>

#7 lore raw

PATCH 1/1 Makefile: Prioritize external dtb if defined

Quoted 49 lines · Michal Simek
Quoted 21 lines · Marek Vasut
Quoted 20 lines · Tom Rini
Quoted 18 lines · Marek Vasut
Quoted 7 lines · Tom Rini
Quoted 5 lines · Michal Simek

Prioritize external dtb if its passed via EXT_DTB than the dtb that was built in the tree. With this patch it appends the specified external dtb to the u-boot image.

Quoted 5 lines
Quoted 3 lines

Applied to u-boot/master, thanks!

The R-Car Gen3 boards (r8a779{5,6}*_salvator-x_defconfig) u-boot.bin size grew from 986 kiB to 1240 kiB with this patch, rendering the boards unbootable. I expect there to be more such cases, so please revert until there's new version which has this fixed.

Quoted 7 lines
Quoted 3 lines

I must have messed something up when re-adjusting this to apply to top of tree. I'll revert this, thanks for reporting. Michal, please rebase the original patch and resend, thanks!

My guess is that it has to do with the LZO compression of the DTBs on Gen3 , that fit-blob.itb is probably appended uncompressed or something.

This patch is already applied to the tree (commit below). It means you please revert what was added by: 3eaf6dcd9362b56e3217559401287dd8fa35b5b2

Thanks,
Michal

commit c8c5e2b84d5d928472b68a51854b727ee90295b2

Author:     Michal Simek <[email protected]>
AuthorDate: Sat Mar 23 11:13:00 2019 +0530
Commit:     Michal Simek <[email protected]>
CommitDate: Tue Apr 16 11:52:02 2019 +0200

Makefile: Prioritize external dtb if defined

Prioritize external dtb if its passed via EXT_DTB than the dtb that was built in the tree. With this patch it appends the specified external dtb to the u-boot image.

Quoted 4 lines
Signed-off-by Siva Durga Prasad Paladugu

<[email protected]>

So I really did step in it, sigh. Revert pushed this morning.

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