[PATCH] Revert "mksunxi_fit_atf.sh: Allow for this to complete when bl31.bin is missing"

[André Przywara]

On 17/03/2020 13:12, Petr Štetiar wrote:

Hi,

> This reverts commit 4c78028737c3185f49f5691183aeac3478b5f699.
> 
> bl31.bin file is mandatory for functional, usable and bootable binaries,
> thus it should be hard error if bl31.bin is missing. It doesn't matter
> if I'm building on autobuilder or locally, the resulting binaries should
> be usable in both cases.
> 
> Cc: Simon Glass <sjg at chromium.org>
> Cc: Tom Rini <trini at konsulko.com>
> Cc: Andre Przywara <andre.przywara at arm.com>
> Cc: Maxime Ripard <maxime.ripard at free-electrons.com>
> Signed-off-by: Petr Štetiar <ynezz at true.cz>
> ---
> 
> I've just spent some time hunting eMMC boot issue on a64-olinuxino. It's
> really easy to miss that warning message on fast build hosts as the message is
> scrolled out very quickly out of the screen

For this reason I tend to use make -s on everything, this reduces the
output to the really important information.
If you need a notion of whether the build did something useful (and how
much), prepend "time" to the make command.

> and thus using the broken images,
> which would get stuck at `Trying to boot from MMC2`.
> 
> I think, that if it's desired to have broken images on the output, then it
> should be handled on the autobuilder itself before build of sunxi target.
> 
> Another option is probably adding AUTOBUILDER_ALLOW_BROKEN_IMAGES config
> option, which would make it clear for everybody.
> 
>  board/sunxi/mksunxi_fit_atf.sh | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/board/sunxi/mksunxi_fit_atf.sh b/board/sunxi/mksunxi_fit_atf.sh
> index 88ad71974706..dea9aaa5691d 100755
> --- a/board/sunxi/mksunxi_fit_atf.sh
> +++ b/board/sunxi/mksunxi_fit_atf.sh
> @@ -7,12 +7,6 @@
>  
>  [ -z "$BL31" ] && BL31="bl31.bin"
>  
> -if [ ! -f $BL31 ]; then
> -	echo "WARNING: BL31 file $BL31 NOT found, resulting binary is non-functional" >&2
> -	echo "Please read the section on ARM Trusted Firmware (ATF) in board/sunxi/README.sunxi64" >&2
> -	BL31=/dev/null

So this message has some good info in it. What about we leave that in,
slightly reworded? And just remove the BL31=/dev/null line, so that the
build will actually fail?

Cheers,
Andre



> -fi
> -
>  if grep -q "^CONFIG_MACH_SUN50I_H6=y" .config; then
>  	BL31_ADDR=0x104000
>  else
>