diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/meson64.h | 3 | ||||
| -rw-r--r-- | include/configs/meson64_android.h | 11 |
2 files changed, 9 insertions, 5 deletions
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 */ 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 \ |