From 82f6508ad7e89f0afcd01007d541179fbc2b9c95 Mon Sep 17 00:00:00 2001
From: Guillaume La Roque <glaroque@baylibre.com>
Date: Fri, 30 Oct 2020 16:03:44 +0100
Subject: 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>
---
 include/configs/meson64_android.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'include')

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                                     \
-- 
cgit v1.3.1


From 014b9f96762d17d04038d8902d419b6476753e4f Mon Sep 17 00:00:00 2001
From: Jaehoon Chung <jh80.chung@samsung.com>
Date: Mon, 2 Nov 2020 12:07:06 +0900
Subject: configs: meson64: relocate config_distro_bootcmmd header

Relocate a config_distro_bootcmd header before defined
CONFIG_EXTRA_ENV_SETTINGS. Otherwise it can't change to specific
environment.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 include/configs/meson64.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index cee69006802..52cc01f73da 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -69,6 +69,8 @@
 	func(DHCP, dhcp, na)
 #endif
 
+#include <config_distro_bootcmd.h>
+
 #ifndef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"stdin=" STDIN_CFG "\0" \
@@ -83,6 +85,5 @@
 	BOOTENV
 #endif
 
-#include <config_distro_bootcmd.h>
 
 #endif /* __MESON64_CONFIG_H */
-- 
cgit v1.3.1