Hi Guillaume, Thank you for the patch.
On jeu., nov. 14, 2024 at 22:29, Guillaume La Roque <glaro...@baylibre.com> wrote: > Actually khadas vim3 use distro command to boot android image. > Move on new bootmeth android for A/B and non-A/B vim3 android. > > Signed-off-by: Guillaume La Roque <glaro...@baylibre.com> > --- > configs/khadas-vim3_android_ab_defconfig | 7 ++++++- > configs/khadas-vim3_android_defconfig | 7 ++++++- > include/configs/khadas-vim3_android.h | 26 ++++++++++++++++++++++---- > include/configs/meson64_android.h | 3 --- > 4 files changed, 34 insertions(+), 9 deletions(-) > > diff --git a/configs/khadas-vim3_android_ab_defconfig > b/configs/khadas-vim3_android_ab_defconfig > index de5357c45cbf..a078c5d363ae 100644 > --- a/configs/khadas-vim3_android_ab_defconfig > +++ b/configs/khadas-vim3_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-vim3_android_defconfig > b/configs/khadas-vim3_android_defconfig > index a0d9c423c3c3..b77a44ce859b 100644 > --- a/configs/khadas-vim3_android_defconfig > +++ b/configs/khadas-vim3_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-vim3_android.h > b/include/configs/khadas-vim3_android.h > index 0e2953fe71b3..096ab4e5fb1f 100644 > --- a/include/configs/khadas-vim3_android.h > +++ b/include/configs/khadas-vim3_android.h > @@ -41,10 +41,28 @@ > "name=rootfs,size=-,uuid=" ROOT_UUID > #endif > > -#define EXTRA_ANDROID_ENV_SETTINGS \ > - "board=vim3\0" \ > - "board_name=vim3\0" \ > +#define CFG_EXTRA_ENV_SETTINGS \ > + "board=vim3\0" \ > + "board_name=vim3\0" \ > + "bootmeths=android\0" \ > + "bootcmd=bootflow scan\0" \ > + "adtb_idx=3\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" \ gpio_recovery is not used anywhere. Can we please drop this? With that addressed, please add: Reviewed-by: Mattijs Korpershoek <mkorpersh...@baylibre.com> > + "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> > +#include <configs/meson64.h> > > #endif /* __CONFIG_H */ > diff --git a/include/configs/meson64_android.h > b/include/configs/meson64_android.h > index 37ef8b8f7a7e..d6ef0a83a686 100644 > --- a/include/configs/meson64_android.h > +++ b/include/configs/meson64_android.h > @@ -104,9 +104,6 @@ > "elif test $board_name = sei610; then " \ > "echo \" Reading DTB for sei610...\"; " \ > "setenv dtb_index 1;" \ > - "elif test $board_name = vim3; then " \ > - "echo \" Reading DTB for vim3...\"; " \ > - "setenv dtb_index 3;" \ > "else " \ > "echo Error: Android boot is not supported for $board_name; " \ > "exit; " \ > > -- > 2.34.1
