[OpenBIOS] [commit] r1234 - in trunk/openbios-devel: arch/ppc/qemu drivers

[repository service]

Author: mcayland
Date: Sun Nov 10 21:14:33 2013
New Revision: 1234
URL: http://tracker.coreboot.org/trac/openbios/changeset/1234

Log:
prep: Move serial port into the new ISA bridge node

This is its real home according to device tree samples that I can find.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland at ilande.co.uk>

Modified:
   trunk/openbios-devel/arch/ppc/qemu/init.c
   trunk/openbios-devel/drivers/pci.c

Modified: trunk/openbios-devel/arch/ppc/qemu/init.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/init.c	Sun Nov 10 21:14:30 2013	(r1233)
+++ trunk/openbios-devel/arch/ppc/qemu/init.c	Sun Nov 10 21:14:33 2013	(r1234)
@@ -662,11 +662,6 @@
 
     ofmem_t *ofmem = ofmem_arch_get_private();
 
-    if (!is_apple()) {
-        /* Initialise PReP serial port */
-        ob_pc_serial_init("", "serial", arch->io_base, 0x3f8ULL, 0);
-    }
-
     openbios_init();
     modules_init();
     setup_timers();
@@ -841,8 +836,8 @@
                 stdout_path = "sccb";
             }
         } else {
-            stdin_path = "/serial";
-            stdout_path = "/serial";
+            stdin_path = "ttya";
+            stdout_path = "ttya";
         }
 
         /* Some bootloaders force the output to the screen device, so

Modified: trunk/openbios-devel/drivers/pci.c
==============================================================================
--- trunk/openbios-devel/drivers/pci.c	Sun Nov 10 21:14:30 2013	(r1233)
+++ trunk/openbios-devel/drivers/pci.c	Sun Nov 10 21:14:33 2013	(r1234)
@@ -870,6 +870,10 @@
 
 int i82378_config_cb(const pci_config_t *config)
 {
+#ifdef CONFIG_DRIVER_PC_SERIAL
+    ob_pc_serial_init(config->path, "serial", arch->io_base, 0x3f8ULL, 0);
+#endif
+
     return 0;
 }