Hi Guillaume,
Thank you for the patch.
On jeu., oct. 17, 2024 at 18:10, Guillaume La Roque <glaro...@baylibre.com>
wrote:
> Actually khadas vim3l use distro command to boot android image.
> Move on new bootmeth android for A/B and non-A/B vim3l android.
>
> Signed-off-by: Guillaume La Roque <glaro...@baylibre.com>
> ---
> configs/khadas-vim3l_android_ab_defconfig | 7 ++++++-
> configs/khadas-vim3l_android_defconfig | 7 ++++++-
> include/configs/khadas-vim3l_android.h | 29 +++++++++++++++++++++++++----
> 3 files changed, 37 insertions(+), 6 deletions(-)
>
> diff --git a/configs/khadas-vim3l_android_ab_defconfig
> b/configs/khadas-vim3l_android_ab_defconfig
> index 4d7b90f23002..43db61056baf 100644
> --- a/configs/khadas-vim3l_android_ab_defconfig
> +++ b/configs/khadas-vim3l_android_ab_defconfig
> @@ -24,6 +24,12 @@ CONFIG_REMAKE_ELF=y
> CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> +CONFIG_BOOTMETH_ANDROID=y
> +# CONFIG_BOOTMETH_EXTLINUX is not set
> +# CONFIG_BOOTMETH_EXTLINUX_PXE is not set
> +# CONFIG_BOOTMETH_EFILOADER is not set
> +# CONFIG_BOOTMETH_EFI_BOOTMGR is not set
> +# CONFIG_BOOTMETH_VBE is not set
> CONFIG_LEGACY_IMAGE_FORMAT=y
> CONFIG_OF_BOARD_SETUP=y
> # CONFIG_DISPLAY_CPUINFO is not set
> @@ -35,7 +41,6 @@ CONFIG_SYS_MAXARGS=32
> CONFIG_CMD_ADTIMG=y
> CONFIG_CMD_ABOOTIMG=y
> # CONFIG_CMD_IMI is not set
> -CONFIG_CMD_BCB=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
> CONFIG_CMD_I2C=y
> diff --git a/configs/khadas-vim3l_android_defconfig
> b/configs/khadas-vim3l_android_defconfig
> index 4ec27262cdc7..32d57a5b9090 100644
> --- a/configs/khadas-vim3l_android_defconfig
> +++ b/configs/khadas-vim3l_android_defconfig
> @@ -24,6 +24,12 @@ CONFIG_REMAKE_ELF=y
> CONFIG_FIT=y
> CONFIG_FIT_SIGNATURE=y
> CONFIG_FIT_VERBOSE=y
> +CONFIG_BOOTMETH_ANDROID=y
> +# CONFIG_BOOTMETH_EXTLINUX is not set
> +# CONFIG_BOOTMETH_EXTLINUX_PXE is not set
> +# CONFIG_BOOTMETH_EFILOADER is not set
> +# CONFIG_BOOTMETH_EFI_BOOTMGR is not set
> +# CONFIG_BOOTMETH_VBE is not set
> CONFIG_LEGACY_IMAGE_FORMAT=y
> CONFIG_OF_BOARD_SETUP=y
> # CONFIG_DISPLAY_CPUINFO is not set
> @@ -34,7 +40,6 @@ CONFIG_SYS_MAXARGS=32
> CONFIG_CMD_ADTIMG=y
> CONFIG_CMD_ABOOTIMG=y
> # CONFIG_CMD_IMI is not set
> -CONFIG_CMD_BCB=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
> CONFIG_CMD_I2C=y
> diff --git a/include/configs/khadas-vim3l_android.h
> b/include/configs/khadas-vim3l_android.h
> index f39a3782d663..4455898b5262 100644
> --- a/include/configs/khadas-vim3l_android.h
> +++ b/include/configs/khadas-vim3l_android.h
> @@ -26,6 +26,7 @@
> "name=super,size=3072M,uuid=${uuid_gpt_super};" \
> "name=userdata,size=11218M,uuid=${uuid_gpt_userdata};" \
> "name=rootfs,size=-,uuid=" ROOT_UUID
> +
nit: un-necessary change here?
> #else
> #define PARTS_DEFAULT \
> "uuid_disk=${uuid_gpt_disk};" \
> @@ -39,12 +40,32 @@
> "name=super,size=1792M,uuid=${uuid_gpt_super};" \
> "name=userdata,size=12722M,uuid=${uuid_gpt_userdata};" \
> "name=rootfs,size=-,uuid=" ROOT_UUID
> +
nit: un-necessary change here?
> #endif
>
> -#define EXTRA_ANDROID_ENV_SETTINGS \
> - "board=vim3l\0" \
> - "board_name=vim3l\0" \
> +#define CFG_EXTRA_ENV_SETTINGS \
> + "board=vim3l\0" \
> + "board_name=vim3l\0" \
> + "bootmeths=android\0" \
> + "bootcmd=bootflow scan\0" \
> + "adtb_idx=2\0" \
> + "partitions=" PARTS_DEFAULT "\0" \
> + "mmcdev=2\0" \
> + "fastboot_raw_partition_bootloader=0x1 0xfff mmcpart 1\0" \
> + "fastboot_raw_partition_bootenv=0x0 0xfff mmcpart 2\0" \
> + "gpio_recovery=88\0" \
> + "check_button=gpio input ${gpio_recovery};test $? -eq 0;\0" \
What is check_button needed for ?
It's used in include/configs/meson64_android.h to check if we should
boot recovery but since we no longer use that file here I think we can
safely remove this.
> + "stdin=" STDIN_CFG "\0" \
> + "stdout=" STDOUT_CFG "\0" \
> + "stderr=" STDOUT_CFG "\0" \
> + "dtboaddr=0x08200000\0" \
> + "loadaddr=0x01080000\0" \
> + "fdt_addr_r=0x01000000\0" \
> + "scriptaddr=0x08000000\0" \
> + "kernel_addr_r=0x01080000\0" \
> + "pxefile_addr_r=0x01080000\0" \
> + "ramdisk_addr_r=0x13000000\0" \
>
> -#include <configs/meson64_android.h>
Should we also patch configs/meson64_android.h to remove everything
related to VIM3L? This way, we don't keep unused code in there.
> +#include <configs/meson64.h>
>
> #endif /* __CONFIG_H */
>
> --
> 2.34.1
