[PATCH 5/6] configs: meson64_android: use logo part label instead of index

[Neil Armstrong]

On 29/07/2021 09:21, Mattijs Korpershoek wrote:
> To display the bootup logo, we read the gpt and assume that the
> partition with index "2" will be the "logo" partition.
> 
> This might not always be the case, and it's very error-prone.
> 
> Load the logo partition by label instead of by index.
> 
> Signed-off-by: Guillaume La Roque <mkorpershoek at baylibre.com>
> Signed-off-by: Mattijs Korpershoek <mkorpershoek at baylibre.com>
> ---
>  include/configs/meson64_android.h | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h
> index e22f05c889..56545a72f8 100644
> --- a/include/configs/meson64_android.h
> +++ b/include/configs/meson64_android.h
> @@ -13,6 +13,10 @@
>  #define BOOT_PARTITION "boot"
>  #endif
>  
> +#ifndef LOGO_PARTITION
> +#define LOGO_PARTITION "logo"
> +#endif
> +
>  #define BOOTENV_DEV_FASTBOOT(devtypeu, devtypel, instance) \
>  	"bootcmd_fastboot=" \
>  		"sm reboot_reason reason;" \
> @@ -104,8 +108,8 @@
>  	"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;" \
> +		"part start mmc ${mmcdev} " LOGO_PARTITION " boot_start;" \
> +		"part size mmc ${mmcdev} " LOGO_PARTITION " boot_size;" \
>  		"if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \
>  			"bmp display ${loadaddr} m m;" \
>  		"fi;" \
> @@ -114,7 +118,6 @@
>  #define CONFIG_EXTRA_ENV_SETTINGS                                     \
>  	"partitions=" PARTS_DEFAULT "\0"                              \
>  	"mmcdev=2\0"                                                  \
> -	"logopart=2\0"                                                \
>  	"gpio_recovery=88\0"                                          \
>  	"check_button=gpio input ${gpio_recovery};test $? -eq 0;\0"   \
>  	"load_logo=" PREBOOT_LOAD_LOGO "\0"			      \
> 


Acked-by: Neil Armstrong <narmstrong at baylibre.com>