From 2b28d97063f23ac7f63c8287285c85fb5b554546 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Thu, 10 Sep 2020 10:41:15 -0700
Subject: [PATCH] RTEMS5: redirect to serial via runtime

---
 modules/libcom/RTEMS/posix/rtems_init.c | 15 +--------------
 src/tools/makeTestfile.pl               |  2 +-
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/modules/libcom/RTEMS/posix/rtems_init.c b/modules/libcom/RTEMS/posix/rtems_init.c
index 6773608f7..16c46ba4e 100644
--- a/modules/libcom/RTEMS/posix/rtems_init.c
+++ b/modules/libcom/RTEMS/posix/rtems_init.c
@@ -45,6 +45,7 @@
 #include <rtems/libio.h>
 #include <rtems/rtc.h>
 #include <rtems/tod.h>
+#include <rtems/sysinit.h>
 
 #ifdef RTEMS_LEGACY_STACK
 #include <rtems/rtems_bsdnet.h>
@@ -968,20 +969,6 @@ POSIX_Init (void *argument)
  * if BSP defaults aren't configured for running tests.
  */
 
-
-/* Ensure that stdio goes to serial (so it can be captured) */
-#if defined(__i386__) && !USE_COM1_AS_CONSOLE
-#include <uart.h>
-#include <libchip/serial.h>
-
-extern int BSPPrintkPort;
-void bsp_predriver_hook(void)
-{
-    Console_Port_Minor = BSP_CONSOLE_PORT_COM1;
-    BSPPrintkPort = BSP_CONSOLE_PORT_COM1;
-}
-#endif
-
 /* reboot immediately when done. */
 #if defined(__i386__) && BSP_PRESS_KEY_FOR_RESET
 void bsp_cleanup(void)
diff --git a/src/tools/makeTestfile.pl b/src/tools/makeTestfile.pl
index 7a8234962..694aebe84 100644
--- a/src/tools/makeTestfile.pl
+++ b/src/tools/makeTestfile.pl
@@ -39,7 +39,7 @@ if( $TA =~ /^win32-x86/ && $HA !~ /^win/ ) {
 
 # Run pc386 test harness w/ QEMU
 } elsif( $TA =~ /^RTEMS-pc386-qemu$/ ) {
-  $exec = "qemu-system-i386 -m 64 -no-reboot -serial stdio -display none -net nic,model=ne2k_pci -net user,restrict=yes -kernel $exe";
+  $exec = "qemu-system-i386 -m 64 -no-reboot -serial stdio -display none -net nic,model=ne2k_pci -net user,restrict=yes -append --console=/dev/com1 -kernel $exe";
 
 # Explicitly fail for other RTEMS targets
 } elsif( $TA =~ /^RTEMS-/ ) {