configs: khadas-vim3l_android{_ab}: move on bootmeth android

Actually khadas vim3l use distro command to boot android image.
Move on new bootmeth android for A/B and non-A/B vim3l android.

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Guillaume La Roque <glaroque@baylibre.com>
Link: https://lore.kernel.org/r/20241126-adnroidv2-v4-3-11636106dc69@baylibre.com
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

diff --git a/configs/khadas-vim3l_android_ab_defconfig b/configs/khadas-vim3l_android_ab_defconfig
index 4d7b90f..43db610 100644 (file)
--- 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 4ec2726..32d57a5 100644 (file)
--- 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 f39a378..1869249 100644 (file)
--- a/include/configs/khadas-vim3l_android.h
+++ b/include/configs/khadas-vim3l_android.h
@@ -41,10 +41,27 @@
        "name=rootfs,size=-,uuid=" ROOT_UUID
 #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"        \
+       "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 77364bb..37ef8b8 100644 (file)
--- 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 = vim3l; then " \
-               "echo \"  Reading DTB for vim3l...\"; " \
-               "setenv dtb_index 2;" \
        "elif test $board_name = vim3; then " \
                "echo \"  Reading DTB for vim3...\"; " \
                "setenv dtb_index 3;" \