diff mbox series

[v3,1/5] imx: mkimage_fit_atf: Fix FIT image if BL31.bin missing

Message ID 20200526104412.3666210-2-heiko@sntech.de
State New
Headers show
Series rockchip: make it possible to sign the u-boot.itb | expand

Commit Message

Heiko Stuebner May 26, 2020, 10:44 a.m. UTC
From: Heiko Stuebner <heiko.stuebner at theobroma-systems.com>

Right now if its bl31.bin is missing, the imx make_fit_atf.sh does
return "sucessful" without generating an .its source file, which
makes autobuilders unhappy.

So this change is similar to Tom Rini's
commit 4c78028737c3 ("mksunxi_fit_atf.sh: Allow for this to complete when bl31.bin is missing")
in that it changes the behaviour to a warning and still lets the script
generate a usable u-boot.its and thus also lets the u-boot.itb get build
successfully

Cc: Stefano Babic <sbabic at denx.de>
Cc: Fabio Estevam <festevam at gmail.com>
Cc: uboot-imx at nxp.com
Signed-off-by: Heiko Stuebner <heiko.stuebner at theobroma-systems.com>
---
changes in v3:
- new patch

 arch/arm/mach-imx/mkimage_fit_atf.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Peng Fan May 26, 2020, 12:53 p.m. UTC | #1
> Subject: [PATCH v3 1/5] imx: mkimage_fit_atf: Fix FIT image if BL31.bin
> missing
> 
> From: Heiko Stuebner <heiko.stuebner at theobroma-systems.com>
> 
> Right now if its bl31.bin is missing, the imx make_fit_atf.sh does return
> "sucessful" without generating an .its source file, which makes autobuilders
> unhappy.
> 
> So this change is similar to Tom Rini's
> commit 4c78028737c3 ("mksunxi_fit_atf.sh: Allow for this to complete when
> bl31.bin is missing") in that it changes the behaviour to a warning and still lets
> the script generate a usable u-boot.its and thus also lets the u-boot.itb get
> build successfully
> 
> Cc: Stefano Babic <sbabic at denx.de>
> Cc: Fabio Estevam <festevam at gmail.com>
> Cc: uboot-imx at nxp.com
> Signed-off-by: Heiko Stuebner <heiko.stuebner at theobroma-systems.com>
> ---
> changes in v3:
> - new patch
> 
>  arch/arm/mach-imx/mkimage_fit_atf.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh
> b/arch/arm/mach-imx/mkimage_fit_atf.sh
> index dd1ca5ad3f..2224d85281 100755
> --- a/arch/arm/mach-imx/mkimage_fit_atf.sh
> +++ b/arch/arm/mach-imx/mkimage_fit_atf.sh
> @@ -12,8 +12,8 @@
>  [ -z "$BL33_LOAD_ADDR" ] && BL33_LOAD_ADDR="0x40200000"
> 
>  if [ ! -f $BL31 ]; then
> -	echo "ERROR: BL31 file $BL31 NOT found" >&2
> -	exit 0
> +	echo "WARNING: BL31 file $BL31 NOT found, resulting binary is
> not-functional" >&2
> +	BL31=/dev/null
>  else
>  	echo "$BL31 size: " >&2
>  	ls -lct $BL31 | awk '{print $5}' >&2

Reviewed-by: Peng Fan <peng.fan at nxp.com>
diff mbox series

Patch

diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh b/arch/arm/mach-imx/mkimage_fit_atf.sh
index dd1ca5ad3f..2224d85281 100755
--- a/arch/arm/mach-imx/mkimage_fit_atf.sh
+++ b/arch/arm/mach-imx/mkimage_fit_atf.sh
@@ -12,8 +12,8 @@ 
 [ -z "$BL33_LOAD_ADDR" ] && BL33_LOAD_ADDR="0x40200000"
 
 if [ ! -f $BL31 ]; then
-	echo "ERROR: BL31 file $BL31 NOT found" >&2
-	exit 0
+	echo "WARNING: BL31 file $BL31 NOT found, resulting binary is not-functional" >&2
+	BL31=/dev/null
 else
 	echo "$BL31 size: " >&2
 	ls -lct $BL31 | awk '{print $5}' >&2