From: Guillaume La Roque <glaroque@baylibre.com>
Date: Fri, 30 Oct 2020 15:03:44 +0000 (+0100)
Subject: configs: meson64_android: don't show logo on ROM USB boot
X-Git-Tag: v2021.01-rc2~6^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82f6508ad7e89f0afcd01007d541179fbc2b9c95;p=pandora-u-boot.git

configs: meson64_android: don't show logo on ROM USB boot

When booting from rom usb, skip the boot logo logic as it's possible
that the partition containing the logo does not exist yet.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Guillaume La Roque <glaroque@baylibre.com>
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
---

diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h
index 8fff915b50a..c47d51c8536 100644
--- a/include/configs/meson64_android.h
+++ b/include/configs/meson64_android.h
@@ -98,11 +98,14 @@
 	func(SYSTEM, system, na) \
 
 #define PREBOOT_LOAD_LOGO \
-	"mmc dev ${mmcdev};" \
-	"part start mmc ${mmcdev} ${logopart} boot_start;" \
-	"part size mmc ${mmcdev} ${logopart} boot_size;" \
-	"if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \
+	"if test \"${boot_source}\" != \"usb\" && " \
+		"gpt verify mmc ${mmcdev} ${partitions}; then; " \
+		"mmc dev ${mmcdev};" \
+		"part start mmc ${mmcdev} ${logopart} boot_start;" \
+		"part size mmc ${mmcdev} ${logopart} boot_size;" \
+		"if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \
 			"bmp display ${loadaddr} m m;" \
+		"fi;" \
 	"fi;"
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                     \