diff options
| author | Tom Rini <trini@konsulko.com> | 2020-11-06 16:42:11 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-11-06 17:46:43 +0300 |
| commit | 896cc5aa4a8fc0c28036b9615a37f0034addad44 (patch) | |
| tree | 8f3c4e19546de377d6ec618911ef6a2c41ec5f85 /include | |
| parent | d062c1344cefb6c368b96efea4c2a20e63657b8d (diff) | |
| parent | 014b9f96762d17d04038d8902d419b6476753e4f (diff) | |
| download | u-boot-896cc5aa4a8fc0c28036b9615a37f0034addad44.tar.xz | |
Merge tag 'u-boot-amlogic-20201105' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- meson64_android: don't show logo on ROM USB boot
- doc: update support matrix and fix vim3/l build instructions
- meson64: relocate config_distro_bootcmmd header
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 cee6900680..52cc01f73d 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 8fff915b50..c47d51c853 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 \ |