[coreboot] [commit] r6302 - in trunk/src/mainboard: getac/p470 kontron/986lcd-m roda/rk886ex
repository service
svn at coreboot.org
Thu Jan 27 08:39:38 CET 2011
Author: oxygene
Date: Thu Jan 27 08:39:38 2011
New Revision: 6302
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6302
Log:
Add a new CMOS variable which triggers activation of the
LPT port. With the CMOS variable set, LPT is found by SeaBIOS,
with the variable reset, it's not.
Signed-off-by: Patrick Georgi <patrick.georgi at secunet.com>
Acked-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
Modified:
trunk/src/mainboard/getac/p470/cmos.layout
trunk/src/mainboard/getac/p470/devicetree.cb
trunk/src/mainboard/getac/p470/romstage.c
trunk/src/mainboard/kontron/986lcd-m/cmos.layout
trunk/src/mainboard/kontron/986lcd-m/devicetree.cb
trunk/src/mainboard/kontron/986lcd-m/romstage.c
trunk/src/mainboard/roda/rk886ex/cmos.layout
trunk/src/mainboard/roda/rk886ex/devicetree.cb
trunk/src/mainboard/roda/rk886ex/romstage.c
Modified: trunk/src/mainboard/getac/p470/cmos.layout
==============================================================================
--- trunk/src/mainboard/getac/p470/cmos.layout Thu Jan 27 04:31:50 2011 (r6301)
+++ trunk/src/mainboard/getac/p470/cmos.layout Thu Jan 27 08:39:38 2011 (r6302)
@@ -93,7 +93,8 @@
416 512 s 0 boot_devices
928 8 h 0 boot_default
936 1 e 8 cmos_defaults_loaded
-#937 47 r 0 unused
+937 1 e 1 lpt
+#938 46 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
Modified: trunk/src/mainboard/getac/p470/devicetree.cb
==============================================================================
--- trunk/src/mainboard/getac/p470/devicetree.cb Thu Jan 27 04:31:50 2011 (r6301)
+++ trunk/src/mainboard/getac/p470/devicetree.cb Thu Jan 27 08:39:38 2011 (r6302)
@@ -86,7 +86,9 @@
device pnp 2e.1 off # ACPI PM
end
# 2e.2 does not exist
- device pnp 2e.3 off # Parallel port
+ device pnp 2e.3 on # Parallel port
+ io 0x60 = 0x378
+ irq 0x70 = 5
end
device pnp 2e.4 on # COM1
io 0x60 = 0x3f8
Modified: trunk/src/mainboard/getac/p470/romstage.c
==============================================================================
--- trunk/src/mainboard/getac/p470/romstage.c Thu Jan 27 04:31:50 2011 (r6301)
+++ trunk/src/mainboard/getac/p470/romstage.c Thu Jan 27 08:39:38 2011 (r6302)
@@ -34,6 +34,7 @@
#include "northbridge/intel/i945/i945.h"
#include "northbridge/intel/i945/raminit.h"
#include "southbridge/intel/i82801gx/i82801gx.h"
+#include "option_table.h"
void setup_ich7_gpios(void)
{
@@ -81,12 +82,16 @@
static void ich7_enable_lpc(void)
{
+ int lpt_en = 0;
+ if (read_option(CMOS_VSTART_lpt, CMOS_VLEN_lpt, 0) != 0) {
+ lpt_en = 1<<2; // enable LPT
+ }
// Enable Serial IRQ
pci_write_config8(PCI_DEV(0, 0x1f, 0), 0x64, 0xd0);
// decode range
pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x80, 0x0007);
// decode range
- pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x82, 0x3f0f);
+ pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x82, 0x3f0b | lpt_en);
// Enable 0x02e0 - 0x2ff
pci_write_config32(PCI_DEV(0, 0x1f, 0), 0x84, 0x001c02e1);
// Enable 0x600 - 0x6ff
Modified: trunk/src/mainboard/kontron/986lcd-m/cmos.layout
==============================================================================
--- trunk/src/mainboard/kontron/986lcd-m/cmos.layout Thu Jan 27 04:31:50 2011 (r6301)
+++ trunk/src/mainboard/kontron/986lcd-m/cmos.layout Thu Jan 27 08:39:38 2011 (r6302)
@@ -104,8 +104,9 @@
968 1 e 2 ethernet1
969 1 e 2 ethernet2
970 1 e 2 ethernet3
+971 1 e 1 lpt
-#971 13 r 0 unused
+#972 12 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
Modified: trunk/src/mainboard/kontron/986lcd-m/devicetree.cb
==============================================================================
--- trunk/src/mainboard/kontron/986lcd-m/devicetree.cb Thu Jan 27 04:31:50 2011 (r6301)
+++ trunk/src/mainboard/kontron/986lcd-m/devicetree.cb Thu Jan 27 08:39:38 2011 (r6302)
@@ -52,7 +52,9 @@
chip superio/winbond/w83627thg
device pnp 2e.0 off # Floppy
end
- device pnp 2e.1 off # Parport
+ device pnp 2e.1 on # Parallel port
+ io 0x60 = 0x378
+ irq 0x70 = 5
end
device pnp 2e.2 on
io 0x60 = 0x3f8
Modified: trunk/src/mainboard/kontron/986lcd-m/romstage.c
==============================================================================
--- trunk/src/mainboard/kontron/986lcd-m/romstage.c Thu Jan 27 04:31:50 2011 (r6301)
+++ trunk/src/mainboard/kontron/986lcd-m/romstage.c Thu Jan 27 08:39:38 2011 (r6302)
@@ -58,12 +58,16 @@
static void ich7_enable_lpc(void)
{
+ int lpt_en = 0;
+ if (read_option(CMOS_VSTART_lpt, CMOS_VLEN_lpt, 0) != 0) {
+ lpt_en = 1<<2; // enable LPT
+ }
// Enable Serial IRQ
pci_write_config8(PCI_DEV(0, 0x1f, 0), 0x64, 0xd0);
// Set COM1/COM2 decode range
pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x80, 0x0010);
// Enable COM1/COM2/KBD/SuperIO1+2
- pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x82, 0x340b);
+ pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x82, 0x340b | lpt_en);
// Enable HWM at 0xa00
pci_write_config32(PCI_DEV(0, 0x1f, 0), 0x84, 0x00fc0a01);
// COM3 decode
Modified: trunk/src/mainboard/roda/rk886ex/cmos.layout
==============================================================================
--- trunk/src/mainboard/roda/rk886ex/cmos.layout Thu Jan 27 04:31:50 2011 (r6301)
+++ trunk/src/mainboard/roda/rk886ex/cmos.layout Thu Jan 27 08:39:38 2011 (r6302)
@@ -93,7 +93,8 @@
416 512 s 0 boot_devices
928 8 h 0 boot_default
936 1 e 8 cmos_defaults_loaded
-#937 47 r 0 unused
+937 1 e 1 lpt
+#938 46 r 0 unused
# coreboot config options: check sums
984 16 h 0 check_sum
Modified: trunk/src/mainboard/roda/rk886ex/devicetree.cb
==============================================================================
--- trunk/src/mainboard/roda/rk886ex/devicetree.cb Thu Jan 27 04:31:50 2011 (r6301)
+++ trunk/src/mainboard/roda/rk886ex/devicetree.cb Thu Jan 27 08:39:38 2011 (r6302)
@@ -83,7 +83,9 @@
#device pci 1e.3 off end # AC'97 Modem
device pci 1f.0 on # LPC bridge
chip superio/smsc/lpc47n227
- device pnp 2e.1 off # Parallel port
+ device pnp 2e.1 on # Parallel port
+ io 0x60 = 0x378
+ irq 0x70 = 5
end
device pnp 2e.2 on # COM1
io 0x60 = 0x3f8
Modified: trunk/src/mainboard/roda/rk886ex/romstage.c
==============================================================================
--- trunk/src/mainboard/roda/rk886ex/romstage.c Thu Jan 27 04:31:50 2011 (r6301)
+++ trunk/src/mainboard/roda/rk886ex/romstage.c Thu Jan 27 08:39:38 2011 (r6302)
@@ -36,6 +36,7 @@
#include "northbridge/intel/i945/i945.h"
#include "northbridge/intel/i945/raminit.h"
#include "southbridge/intel/i82801gx/i82801gx.h"
+#include "option_table.h"
void setup_ich7_gpios(void)
{
@@ -68,12 +69,16 @@
static void ich7_enable_lpc(void)
{
+ int lpt_en = 0;
+ if (read_option(CMOS_VSTART_lpt, CMOS_VLEN_lpt, 0) != 0) {
+ lpt_en = 1<<2; // enable LPT
+ }
// Enable Serial IRQ
pci_write_config8(PCI_DEV(0, 0x1f, 0), 0x64, 0xd0);
// decode range
pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x80, 0x0007);
// decode range
- pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x82, 0x3f0f);
+ pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x82, 0x3f0b | lpt_en);
// Enable 0x02e0
pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x84, 0x02e1);
pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x86, 0x001c);
More information about the coreboot
mailing list