[PATCH 4/6] configs: meson64_android: use boot part label instead of index

[Neil Armstrong]

On 29/07/2021 09:21, Mattijs Korpershoek wrote:
> To boot Android, we read the gpt and assume that the partition with
> index "1" will be the "boot" partition.
> 
> This might not always be the case, as there are no requirements from
> Android on the partition order.
> 
> However, Android does seem to use the "boot" label quite a lot on their
> public documentation [1]
> 
> Load the boot partition by label instead of by index
> 
> [1] https://source.android.com/devices/bootloader/partitions
> Signed-off-by: Guillaume La Roque <mkorpershoek at baylibre.com>
> Signed-off-by: Mattijs Korpershoek <mkorpershoek at baylibre.com>
> ---
>  include/configs/meson64_android.h | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h
> index 4027a7fe0d..e22f05c889 100644
> --- a/include/configs/meson64_android.h
> +++ b/include/configs/meson64_android.h
> @@ -9,6 +9,9 @@
>  #ifndef __MESON64_ANDROID_CONFIG_H
>  #define __MESON64_ANDROID_CONFIG_H
>  
> +#ifndef BOOT_PARTITION
> +#define BOOT_PARTITION "boot"
> +#endif
>  
>  #define BOOTENV_DEV_FASTBOOT(devtypeu, devtypel, instance) \
>  	"bootcmd_fastboot=" \
> @@ -77,11 +80,11 @@
>  
>  #define BOOTENV_DEV_SYSTEM(devtypeu, devtypel, instance) \
>  	"bootcmd_system=" \
> -		"echo Loading Android boot partition...;" \
> +		"echo Loading Android " BOOT_PARTITION " partition...;" \
>  		"mmc dev ${mmcdev};" \
>  		"setenv bootargs ${bootargs} console=${console} androidboot.serialno=${serial#};" \
> -		"part start mmc ${mmcdev} ${bootpart} boot_start;" \
> -		"part size mmc ${mmcdev} ${bootpart} boot_size;" \
> +		"part start mmc ${mmcdev} " BOOT_PARTITION " boot_start;" \
> +		"part size mmc ${mmcdev} " BOOT_PARTITION " boot_size;" \
>  		"if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \
>  			"echo Running Android...;" \
>  			"bootm ${loadaddr};" \
> @@ -111,7 +114,6 @@
>  #define CONFIG_EXTRA_ENV_SETTINGS                                     \
>  	"partitions=" PARTS_DEFAULT "\0"                              \
>  	"mmcdev=2\0"                                                  \
> -	"bootpart=1\0"                                                \
>  	"logopart=2\0"                                                \
>  	"gpio_recovery=88\0"                                          \
>  	"check_button=gpio input ${gpio_recovery};test $? -eq 0;\0"   \
> 


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