summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorMattijs Korpershoek <mkorpershoek@baylibre.com>2021-07-29 10:21:13 +0300
committerNeil Armstrong <narmstrong@baylibre.com>2021-07-29 12:37:26 +0300
commit143e153385f67943f66832d702c29e0087a3512c (patch)
treefb121aea930d5c3e4dc5637dc0edee9c82794019 /include/configs
parent211f1d993ce9337681bbd07629cbd83e5dfea999 (diff)
downloadu-boot-143e153385f67943f66832d702c29e0087a3512c.tar.xz
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>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/meson64_android.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h
index 56545a72f8..3b61d5f703 100644
--- 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" \