From: Patrick Wildt Date: Thu, 28 May 2020 21:27:38 +0200 Subject: imx: move ATF to the back of the FIT to fix loading over yModem In-Reply-To: <20200508095947.GA60002@ryzen.blueri.se> References: <20200508095947.GA60002@ryzen.blueri.se> Message-ID: <20200528192738.GA17870@ryzen.blueri.se> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Ping? On Fri, May 08, 2020 at 11:59:47AM +0200, Patrick Wildt wrote: > With yModem the FIT Image is only supplied once, so we can only > seek forward in the yModem supplied image and never backwards. > With the recent changes to the SPL mechanism, including loading > U-Boot first, FDT after, then the loadables, we must also reorder > the FIT image script to make sure that the loadables are last in > the FIT image. > > Signed-off-by: Patrick Wildt > > diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh b/arch/arm/mach-imx/mkimage_fit_atf.sh > index dd1ca5ad3fd..fe12b7bb4bd 100755 > --- a/arch/arm/mach-imx/mkimage_fit_atf.sh > +++ b/arch/arm/mach-imx/mkimage_fit_atf.sh > @@ -62,6 +62,23 @@ cat << __HEADER_EOF > compression = "none"; > load = <$BL33_LOAD_ADDR>; > }; > +__HEADER_EOF > + > +cnt=1 > +for dtname in $* > +do > + cat << __FDT_IMAGE_EOF > + fdt@$cnt { > + description = "$(basename $dtname .dtb)"; > + data = /incbin/("$dtname"); > + type = "flat_dt"; > + compression = "none"; > + }; > +__FDT_IMAGE_EOF > +cnt=$((cnt+1)) > +done > + > +cat << __HEADER_EOF > atf at 1 { > description = "ARM Trusted Firmware"; > os = "arm-trusted-firmware"; > @@ -88,20 +105,6 @@ cat << __HEADER_EOF > __HEADER_EOF > fi > > -cnt=1 > -for dtname in $* > -do > - cat << __FDT_IMAGE_EOF > - fdt@$cnt { > - description = "$(basename $dtname .dtb)"; > - data = /incbin/("$dtname"); > - type = "flat_dt"; > - compression = "none"; > - }; > -__FDT_IMAGE_EOF > -cnt=$((cnt+1)) > -done > - > cat << __CONF_HEADER_EOF > }; > configurations {