configs: meson64_android: don't set console bootargs

The console bootargs are already set from the kernel commandline.
On Android, this is done in yukawa at [1]

Don't set it in the bootloader since it's overridden by the kernel anyways.

[1] https://android-review.googlesource.com/c/device/amlogic/yukawa/+/1112994
Signed-off-by: Guillaume La Roque <mkorpershoek@baylibre.com>
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h
index 56545a72f86181ed0a9dd7eb752605bc337637dd..3b61d5f70302f8d8807edf221a5d402e75ea0e24 100644 (file)
--- a/include/configs/meson64_android.h
+++ b/include/configs/meson64_android.h
@@ -86,7 +86,7 @@
        "bootcmd_system=" \
                "echo Loading Android " BOOT_PARTITION " partition...;" \
                "mmc dev ${mmcdev};" \
-               "setenv bootargs ${bootargs} console=${console} androidboot.serialno=${serial#};" \
+               "setenv bootargs ${bootargs} androidboot.serialno=${serial#};" \
                "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 " \
@@ -121,8 +121,6 @@
        "gpio_recovery=88\0"                                          \
        "check_button=gpio input ${gpio_recovery};test $? -eq 0;\0"   \
        "load_logo=" PREBOOT_LOAD_LOGO "\0"                           \
-       "console=/dev/ttyAML0\0"                                      \
-       "bootargs=no_console_suspend\0"                               \
        "stdin=" STDIN_CFG "\0"                                       \
        "stdout=" STDOUT_CFG "\0"                                     \
        "stderr=" STDOUT_CFG "\0"                                     \