From: Tom Rini Date: Wed, 30 Sep 2020 11:48:48 -0400 Subject: [PATCH v2] optee: copy FDT OP-TEE related nodes before generic FDT changes In-Reply-To: <20200930174454.v2.1.I3f984b644583cb7080d779898cebfed8669d3f33@changeid> References: <20200930174454.v2.1.I3f984b644583cb7080d779898cebfed8669d3f33@changeid> Message-ID: <20200930154848.GE14816@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 Wed, Sep 30, 2020 at 05:45:08PM +0200, Patrick Delaunay wrote: > From: Etienne Carriere > > Move call to optee_copy_fdt_nodes() introduced by [1] before generic > changes in kernel FDT so that platform specific changes are not > overridden by the changes made by this function. > > Link: [1] commit 6ccb05eae01b ("image: fdt: copy possible optee nodes to a loaded devicetree") > > Fixes: 6ccb05eae01b ('image: fdt: copy possible optee nodes to a loaded devicetree') > Signed-off-by: Etienne Carriere > Signed-off-by: Patrick Delaunay > --- > > Changes in v2: > - rebase on master branch > - add Fixes tag Note that this applied cleanly for me and I reworded the commit slightly differently to also include a fixes tag. I'm currently testing this (just to be safe). Sorry for not being clear in the other thread I would just grab that and add the tag. -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: