[PATCH] Disable ScreenAndDebug in case both serial console and serial debug are active

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann 
---
 src/sercon.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/sercon.c b/src/sercon.c
index 0b7722ec08..72ebf82452 100644
--- a/src/sercon.c
+++ b/src/sercon.c
@@ -523,6 +523,10 @@ void sercon_setup(void)
         return;
     dprintf(1, "sercon: using ioport 0x%x\n", addr);

+    if (CONFIG_DEBUG_SERIAL)
+        if (addr == CONFIG_DEBUG_SERIAL_PORT)
+            ScreenAndDebug = 0;
+
     vgabios = GET_IVT(0x10);
     seabios = FUNC16(entry_10);
     if (vgabios.seg != seabios.seg ||

[Kevin O'Connor]

On Fri, Nov 03, 2017 at 08:40:57AM +0100, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann

Thanks.  I committed this patch.  Due to this and the recent change to
timer_calc_usec, I'm going to push back the release a few days.

-Kevin