summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@secunet.com>2011-10-07 14:43:27 +0200
committerPatrick Georgi <patrick@georgi-clan.de>2011-10-13 11:04:36 +0200
commit390a3374ca597ccd127eca0b8950d5051cd0e697 (patch)
treec316b591a38fb5cb68586ff9398d7d70e9b6daad
parentb0a9c5ccf31514630755e9a5d15204a55a47740f (diff)
downloadcoreboot-390a3374ca597ccd127eca0b8950d5051cd0e697.tar.xz
amd/sb600: Enable COM2 at all times in early setup
Otherwise with a coreboot log on COM2 (which doesn't work) the boot process takes eons. Change-Id: I886f98b715c1f384c8693f2977671ff15897b5a5 Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com> Reviewed-on: http://review.coreboot.org/241 Reviewed-by: Marc Jones <marcj303@gmail.com> Tested-by: build bot (Jenkins)
-rw-r--r--src/southbridge/amd/sb600/early_setup.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/southbridge/amd/sb600/early_setup.c b/src/southbridge/amd/sb600/early_setup.c
index 838ea319f6..5ffd3d8806 100644
--- a/src/southbridge/amd/sb600/early_setup.c
+++ b/src/southbridge/amd/sb600/early_setup.c
@@ -53,11 +53,11 @@ static u8 get_sb600_revision(void)
/***************************************
* Legacy devices are mapped to LPC space.
-* Serial port 0
+* Serial port 0, 1
* KBC Port
* ACPI Micro-controller port
* This function does not change port 0x80 decoding.
-* Console output through any port besides 0x3f8 is unsupported.
+* Console output through any port besides 0x2f8/0x3f8 is unsupported.
* If you use FWH ROMs, you have to setup IDSEL.
* Reviewed-by: Carl-Daniel Hailfinger
* Reviewed against AMD SB600 Register Reference Manual rev. 3.03, section 3.1
@@ -84,10 +84,9 @@ static void sb600_lpc_init(void)
pci_write_config32(dev, 0x64, reg32);
dev = pci_locate_device(PCI_ID(0x1002, 0x438d), 0); /* LPC Controller */
- /* Decode port 0x3f8-0x3ff (Serial 0) */
- // XXX Serial port decode on LPC is hardcoded to 0x3f8
+ /* Decode port 0x3f8-0x3ff (Serial 0), 0x2f8-0x2ff (Serial 1) */
reg8 = pci_read_config8(dev, 0x44);
- reg8 |= 1 << 6;
+ reg8 |= (1 << 6) | (1 << 7);
pci_write_config8(dev, 0x44, reg8);
/* Decode port 0x60 & 0x64 (PS/2 keyboard) and port 0x62 & 0x66 (ACPI)*/