[OpenBIOS] [commit] r1235 - in trunk/openbios-devel: arch/ppc/qemu config/examples drivers
repository service
svn at openbios.org
Sun Nov 10 21:14:39 CET 2013
Author: mcayland
Date: Sun Nov 10 21:14:39 2013
New Revision: 1235
URL: http://tracker.coreboot.org/trac/openbios/changeset/1235
Log:
prep: Add PC keyboard to PPC build and enable it
The default PPC configuration now includes a PC keyboard driver for PReP
machines, and adds it as a device node in the ISA bridge. This provides
a working keyboard in graphical mode for PReP machines.
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/config/examples/ppc_config.xml
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:33 2013 (r1234)
+++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Nov 10 21:14:39 2013 (r1235)
@@ -852,8 +852,13 @@
push_str("screen");
fword("property");
} else {
- stdin_path = "adb-keyboard";
- stdout_path = "screen";
+ if (is_apple()) {
+ stdin_path = "adb-keyboard";
+ stdout_path = "screen";
+ } else {
+ stdin_path = "keyboard";
+ stdout_path = "screen";
+ }
}
kvm_of_init();
Modified: trunk/openbios-devel/config/examples/ppc_config.xml
==============================================================================
--- trunk/openbios-devel/config/examples/ppc_config.xml Sun Nov 10 21:14:33 2013 (r1234)
+++ trunk/openbios-devel/config/examples/ppc_config.xml Sun Nov 10 21:14:39 2013 (r1235)
@@ -9,6 +9,7 @@
<option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/>
<option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/>
<option name="CONFIG_DRIVER_PC_SERIAL" type="boolean" value="true"/>
+ <option name="CONFIG_DRIVER_PC_KBD" type="boolean" value="true"/>
<option name="CONFIG_SERIAL_PORT" type="integer" value="0"/>
<option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/>
<option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/>
Modified: trunk/openbios-devel/drivers/pci.c
==============================================================================
--- trunk/openbios-devel/drivers/pci.c Sun Nov 10 21:14:33 2013 (r1234)
+++ trunk/openbios-devel/drivers/pci.c Sun Nov 10 21:14:39 2013 (r1235)
@@ -873,6 +873,9 @@
#ifdef CONFIG_DRIVER_PC_SERIAL
ob_pc_serial_init(config->path, "serial", arch->io_base, 0x3f8ULL, 0);
#endif
+#ifdef CONFIG_DRIVER_PC_KBD
+ ob_pc_kbd_init(config->path, "8042", arch->io_base, 0x60ULL, 0);
+#endif
return 0;
}
More information about the OpenBIOS
mailing list