From 6aad142ac856cbd6fed95ceb127424d97e6bc85d Mon Sep 17 00:00:00 2001 From: CueMaxX Date: Sat, 25 Mar 2023 10:50:31 +0100 Subject: [PATCH] Update boot-sunxi.cmd 'setenv console "display"' in boot-sunxi.cmd & in armbianEnv.txt had the same effect as 'setenv console "both"'. That was due to a false if-statement in boot-sunxi.cmd:41 Fixed that, so 'setenv console "display"' will not co-enable the serial console anymore. --- config/bootscripts/boot-sunxi.cmd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/bootscripts/boot-sunxi.cmd b/config/bootscripts/boot-sunxi.cmd index 9570a24ac0..85fc0b93ee 100644 --- a/config/bootscripts/boot-sunxi.cmd +++ b/config/bootscripts/boot-sunxi.cmd @@ -38,8 +38,9 @@ if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then env import -t ${load_addr} ${filesize} fi -if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,115200 console=tty1"; fi +if test "${console}" = "display"; then setenv consoleargs "console=tty1"; fi if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; fi +if test "${console}" = "both"; then setenv consoleargs "console=ttyS0,115200 console=tty1"; fi if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi if test "${bootlogo}" = "true"; then setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"