From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Mon, 20 May 2019 10:04:34 -0400 Subject: [U-Boot] [PATCH] Makefile: Prioritize external dtb if defined In-Reply-To: References: <20190519204456.GX22232@bill-the-cat> <20190519220851.GP22232@bill-the-cat> <44561739-1a28-c70a-3fc0-836665f70eb6@gmail.com> Message-ID: <20190520140434.GR22232@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 > >>>>> Signed-off-by: Siva Durga Prasad Paladugu > >>>>> Reviewed-by: Simon Glass > >>>> > >>>> 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 > AuthorDate: Sat Mar 23 11:13:00 2019 +0530 > Commit: Michal Simek > 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 > Signed-off-by: Siva Durga Prasad Paladugu > > Reviewed-by: Simon Glass 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: