Hi,

Le 11/10/2024 à 17:51, Mattijs Korpershoek a écrit :
The device tree overlays are not part of the
Android Common Kernel code [1]

Historically, they existed to enable some Android specific
features but they have been removed.

Remove the dtbos logic since these files do no longer exist.

[1] 
https://android.googlesource.com/kernel/common/+/ac2ea0bb91a3b5f5e71eba66c441e58beca6767e/arch/arm64/boot/dts/amlogic/
Signed-off-by: Mattijs Korpershoek <mkorpersh...@baylibre.com>
---
  include/configs/meson64_android.h | 26 +-------------------------
  1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/include/configs/meson64_android.h 
b/include/configs/meson64_android.h
index c0e977abb01f..fa520265800c 100644
--- a/include/configs/meson64_android.h
+++ b/include/configs/meson64_android.h
@@ -116,31 +116,7 @@
        "fi; " \
        "abootimg get dtb --index=$dtb_index dtb_start dtb_size; " \
        "cp.b $dtb_start $fdt_addr_r $dtb_size; " \
-       "fdt addr $fdt_addr_r  0x80000; " \
-       "if test $board_name = sei510; then " \
-               "echo \"  Reading DTBO for sei510...\"; " \
-               "setenv dtbo_index 0;" \
-       "elif test $board_name = sei610; then " \
-               "echo \"  Reading DTBO for sei610...\"; " \
-               "setenv dtbo_index 1;" \
-       "elif test $board_name = vim3l; then " \
-               "echo \"  Reading DTBO for vim3l...\"; " \
-               "setenv dtbo_index 2;" \
-       "elif test $board_name = vim3; then " \
-               "echo \"  Reading DTBO for vim3...\"; " \
-               "setenv dtbo_index 3;" \
-       "else " \
-               "echo Error: Android boot is not supported for $board_name; " \
-               "exit; " \
-       "fi; " \
-       "part start mmc ${mmcdev} dtbo${slot_suffix} p_dtbo_start; " \
-       "part size mmc ${mmcdev} dtbo${slot_suffix} p_dtbo_size; " \
-       "mmc read ${dtboaddr} ${p_dtbo_start} ${p_dtbo_size}; " \
-       "echo \"  Applying DTBOs...\"; " \
-       "adtimg addr $dtboaddr; " \
-       "adtimg get dt --index=$dtbo_index dtbo0_addr; " \
-       "fdt apply $dtbo0_addr;" \
-       "setenv bootargs \"$bootargs androidboot.dtbo_idx=$dtbo_index \";"\
+       "fdt addr $fdt_addr_r  0x80000; "
#define BOOT_CMD "bootm ${loadaddr} ${loadaddr} ${fdt_addr_r};"

Reviewed-by: Guillaume La Roque <glaro...@baylibre.com>



Reply via email to