From ec0f98510935afb32aa342f1923516f693fbb117 Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Sat, 6 Mar 2021 13:32:17 +0300 Subject: pikvm/pikvm#224: disable serial0 console --- configs/os/cmdline/v0-hdmi-rpi.sed | 4 +++- configs/os/cmdline/v0-hdmi-rpi2.sed | 2 ++ configs/os/cmdline/v0-hdmi-rpi3.sed | 2 ++ configs/os/cmdline/v0-hdmi-zerow.sed | 4 ++++ configs/os/cmdline/v0-hdmiusb-rpi.sed | 2 ++ configs/os/cmdline/v0-hdmiusb-rpi2.sed | 2 ++ configs/os/cmdline/v0-hdmiusb-rpi3.sed | 2 ++ configs/os/cmdline/v0-hdmiusb-zerow.sed | 2 ++ 8 files changed, 19 insertions(+), 1 deletion(-) diff --git a/configs/os/cmdline/v0-hdmi-rpi.sed b/configs/os/cmdline/v0-hdmi-rpi.sed index 81cc40cb..4f2dfa92 100644 --- a/configs/os/cmdline/v0-hdmi-rpi.sed +++ b/configs/os/cmdline/v0-hdmi-rpi.sed @@ -1,3 +1,5 @@ -s/rootwait/cma=64M rootwait/g s/console=ttyAMA0\,115200//g s/kgdboc=ttyAMA0\,115200//g +s/console=serial0\,115200//g +s/kgdboc=serial0\,115200//g +s/rootwait/cma=64M rootwait/g diff --git a/configs/os/cmdline/v0-hdmi-rpi2.sed b/configs/os/cmdline/v0-hdmi-rpi2.sed index b3614eb0..7d041e3f 100644 --- a/configs/os/cmdline/v0-hdmi-rpi2.sed +++ b/configs/os/cmdline/v0-hdmi-rpi2.sed @@ -1,3 +1,5 @@ s/console=ttyAMA0\,115200//g s/kgdboc=ttyAMA0\,115200//g +s/console=serial0\,115200//g +s/kgdboc=serial0\,115200//g s/rootwait/cma=128M rootwait/g diff --git a/configs/os/cmdline/v0-hdmi-rpi3.sed b/configs/os/cmdline/v0-hdmi-rpi3.sed index b3614eb0..7d041e3f 100644 --- a/configs/os/cmdline/v0-hdmi-rpi3.sed +++ b/configs/os/cmdline/v0-hdmi-rpi3.sed @@ -1,3 +1,5 @@ s/console=ttyAMA0\,115200//g s/kgdboc=ttyAMA0\,115200//g +s/console=serial0\,115200//g +s/kgdboc=serial0\,115200//g s/rootwait/cma=128M rootwait/g diff --git a/configs/os/cmdline/v0-hdmi-zerow.sed b/configs/os/cmdline/v0-hdmi-zerow.sed index 69372c9f..4f2dfa92 100644 --- a/configs/os/cmdline/v0-hdmi-zerow.sed +++ b/configs/os/cmdline/v0-hdmi-zerow.sed @@ -1 +1,5 @@ +s/console=ttyAMA0\,115200//g +s/kgdboc=ttyAMA0\,115200//g +s/console=serial0\,115200//g +s/kgdboc=serial0\,115200//g s/rootwait/cma=64M rootwait/g diff --git a/configs/os/cmdline/v0-hdmiusb-rpi.sed b/configs/os/cmdline/v0-hdmiusb-rpi.sed index 57f42700..d2ac8b1e 100644 --- a/configs/os/cmdline/v0-hdmiusb-rpi.sed +++ b/configs/os/cmdline/v0-hdmiusb-rpi.sed @@ -1,2 +1,4 @@ s/console=ttyAMA0\,115200//g s/kgdboc=ttyAMA0\,115200//g +s/console=serial0\,115200//g +s/kgdboc=serial0\,115200//g diff --git a/configs/os/cmdline/v0-hdmiusb-rpi2.sed b/configs/os/cmdline/v0-hdmiusb-rpi2.sed index 57f42700..d2ac8b1e 100644 --- a/configs/os/cmdline/v0-hdmiusb-rpi2.sed +++ b/configs/os/cmdline/v0-hdmiusb-rpi2.sed @@ -1,2 +1,4 @@ s/console=ttyAMA0\,115200//g s/kgdboc=ttyAMA0\,115200//g +s/console=serial0\,115200//g +s/kgdboc=serial0\,115200//g diff --git a/configs/os/cmdline/v0-hdmiusb-rpi3.sed b/configs/os/cmdline/v0-hdmiusb-rpi3.sed index 57f42700..d2ac8b1e 100644 --- a/configs/os/cmdline/v0-hdmiusb-rpi3.sed +++ b/configs/os/cmdline/v0-hdmiusb-rpi3.sed @@ -1,2 +1,4 @@ s/console=ttyAMA0\,115200//g s/kgdboc=ttyAMA0\,115200//g +s/console=serial0\,115200//g +s/kgdboc=serial0\,115200//g diff --git a/configs/os/cmdline/v0-hdmiusb-zerow.sed b/configs/os/cmdline/v0-hdmiusb-zerow.sed index 57f42700..d2ac8b1e 100644 --- a/configs/os/cmdline/v0-hdmiusb-zerow.sed +++ b/configs/os/cmdline/v0-hdmiusb-zerow.sed @@ -1,2 +1,4 @@ s/console=ttyAMA0\,115200//g s/kgdboc=ttyAMA0\,115200//g +s/console=serial0\,115200//g +s/kgdboc=serial0\,115200//g -- cgit v1.2.3