From ef14f6449eb2350b6888864c211aae0f3047c01c Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 19 Jun 2014 13:56:24 -0700 Subject: [PATCH] configure_bootloaders: only add a single serial console boot arg Only one console of each type (virtual, serial, etc.) is supported in the boot args. Only add ttyS0 if no other serial consoles have been provided. --- build_library/configure_bootloaders.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build_library/configure_bootloaders.sh b/build_library/configure_bootloaders.sh index 199f3bdf82..77d5b05758 100755 --- a/build_library/configure_bootloaders.sh +++ b/build_library/configure_bootloaders.sh @@ -83,7 +83,11 @@ configure_syslinux() { # Add ttyS0 as a secondary console, useful for qemu -nographic # This leaves /dev/console mapped to tty0 (vga) which is reasonable default. - syslinux_args="console=ttyS0,115200n8 ${common_args}" + if [[ ${common_args} == *console=ttyS* ]] ; then + syslinux_args="${common_args}" + else + syslinux_args="console=ttyS0,115200n8 ${common_args}" + fi sudo_clobber "${SYSLINUX_DIR}/syslinux.cfg" <