[U-Boot] [PATCH] Makefile: Prioritize external dtb if defined

[U-Boot] [PATCH] Makefile: Prioritize external dtb if defined

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

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
---

 Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index c1af9307b38e..83da41d87d6e 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
-- 
1.9.1

[U-Boot] [PATCH] Makefile: Prioritize external dtb if defined

[Simon Glass]

On Mon, 25 Mar 2019 at 08:55, Michal Simek <michal.simek@xilinx.com> wrote:
>
> 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: Michal Simek <michal.simek@xilinx.com>
> Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
> ---
>
>  Makefile | 5 +++++
>  1 file changed, 5 insertions(+)

Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH] Makefile: Prioritize external dtb if defined

[Tom Rini]

On Mon, Mar 25, 2019 at 03:55:16PM +0100, Michal Simek wrote:

> 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: Michal Simek <michal.simek@xilinx.com>
> Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!

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

[U-Boot] [PATCH] Makefile: Prioritize external dtb if defined

[Marek Vasut]

On 5/19/19 10:44 PM, Tom Rini wrote:
> On Mon, Mar 25, 2019 at 03:55:16PM +0100, Michal Simek wrote:
> 
>> 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: Michal Simek <michal.simek@xilinx.com>
>> Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
>> Reviewed-by: Simon Glass <sjg@chromium.org>
> 
> 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.

-- 
Best regards,
Marek Vasut

[U-Boot] [PATCH] Makefile: Prioritize external dtb if defined

[Tom Rini]

On Mon, May 20, 2019 at 12:03:45AM +0200, Marek Vasut wrote:
> On 5/19/19 10:44 PM, Tom Rini wrote:
> > On Mon, Mar 25, 2019 at 03:55:16PM +0100, Michal Simek wrote:
> > 
> >> 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: Michal Simek <michal.simek@xilinx.com>
> >> Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
> >> Reviewed-by: Simon Glass <sjg@chromium.org>
> > 
> > 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!

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

[U-Boot] [PATCH] Makefile: Prioritize external dtb if defined

[Marek Vasut]

On 5/20/19 12:08 AM, Tom Rini wrote:
> On Mon, May 20, 2019 at 12:03:45AM +0200, Marek Vasut wrote:
>> On 5/19/19 10:44 PM, Tom Rini wrote:
>>> On Mon, Mar 25, 2019 at 03:55:16PM +0100, Michal Simek wrote:
>>>
>>>> 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: Michal Simek <michal.simek@xilinx.com>
>>>> Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
>>>> Reviewed-by: Simon Glass <sjg@chromium.org>
>>>
>>> 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!

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.

-- 
Best regards,
Marek Vasut

[U-Boot] [PATCH] Makefile: Prioritize external dtb if defined

[Michal Simek]

On 19. 05. 19 15:15, Marek Vasut wrote:
> On 5/20/19 12:08 AM, Tom Rini wrote:
>> On Mon, May 20, 2019 at 12:03:45AM +0200, Marek Vasut wrote:
>>> On 5/19/19 10:44 PM, Tom Rini wrote:
>>>> On Mon, Mar 25, 2019 at 03:55:16PM +0100, Michal Simek wrote:
>>>>
>>>>> 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: Michal Simek <michal.simek@xilinx.com>
>>>>> Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
>>>>> Reviewed-by: Simon Glass <sjg@chromium.org>
>>>>
>>>> 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!
> 
> 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 <michal.simek@xilinx.com>
AuthorDate: Sat Mar 23 11:13:00 2019 +0530
Commit:     Michal Simek <michal.simek@xilinx.com>
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: Michal Simek <michal.simek@xilinx.com>
    Signed-off-by: Siva Durga Prasad Paladugu
<siva.durga.paladugu@xilinx.com>
    Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH] Makefile: Prioritize external dtb if defined

[Tom Rini]

On Sun, May 19, 2019 at 11:07:03AM -0700, Michal Simek wrote:
> On 19. 05. 19 15:15, Marek Vasut wrote:
> > On 5/20/19 12:08 AM, Tom Rini wrote:
> >> On Mon, May 20, 2019 at 12:03:45AM +0200, Marek Vasut wrote:
> >>> On 5/19/19 10:44 PM, Tom Rini wrote:
> >>>> On Mon, Mar 25, 2019 at 03:55:16PM +0100, Michal Simek wrote:
> >>>>
> >>>>> 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: Michal Simek <michal.simek@xilinx.com>
> >>>>> Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
> >>>>> Reviewed-by: Simon Glass <sjg@chromium.org>
> >>>>
> >>>> 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!
> > 
> > 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 <michal.simek@xilinx.com>
> AuthorDate: Sat Mar 23 11:13:00 2019 +0530
> Commit:     Michal Simek <michal.simek@xilinx.com>
> 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: Michal Simek <michal.simek@xilinx.com>
>     Signed-off-by: Siva Durga Prasad Paladugu
> <siva.durga.paladugu@xilinx.com>
>     Reviewed-by: Simon Glass <sjg@chromium.org>

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

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