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

Petr Štetiar ynezz at true.cz
Tue Mar 17 14:12:55 CET 2020

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 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
 if grep -q "^CONFIG_MACH_SUN50I_H6=y" .config; then

More information about the U-Boot mailing list