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 8fff915..c47d51c 100644 (file)
--- 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                                     \