summaryrefslogtreecommitdiff
path: root/src/southbridge
diff options
context:
space:
mode:
authorJuhana Helovuo <juhe@iki.fi>2010-09-13 14:43:02 +0000
committerMyles Watson <mylesgw@gmail.com>2010-09-13 14:43:02 +0000
commit50b78b66d3e8c08ff86b0b82bbfa35537d3de053 (patch)
treeab9ae9886909dbef619a827319ab3174b5bd6c22 /src/southbridge
parentcb817beb67986df5b315f04f7c9c620a2d5eefde (diff)
downloadcoreboot-50b78b66d3e8c08ff86b0b82bbfa35537d3de053.tar.xz
Print an error and correct pci scan limits. Skip sb700 ISA DMA init if needed.
Signed-off-by: Juhana Helovuo <juhe@iki.fi> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5805 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/southbridge')
-rw-r--r--src/southbridge/amd/sb700/Kconfig6
-rw-r--r--src/southbridge/amd/sb700/sb700_lpc.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/src/southbridge/amd/sb700/Kconfig b/src/southbridge/amd/sb700/Kconfig
index db43e5e51d..e7592897e1 100644
--- a/src/southbridge/amd/sb700/Kconfig
+++ b/src/southbridge/amd/sb700/Kconfig
@@ -20,3 +20,9 @@
config SOUTHBRIDGE_AMD_SB700
bool
select IOAPIC
+
+config SOUTHBRIDGE_AMD_SB700_SKIP_ISA_DMA_INIT
+ bool
+ default n
+ depends on SOUTHBRIDGE_AMD_SB700
+
diff --git a/src/southbridge/amd/sb700/sb700_lpc.c b/src/southbridge/amd/sb700/sb700_lpc.c
index 3a75512260..14ed1b5418 100644
--- a/src/southbridge/amd/sb700/sb700_lpc.c
+++ b/src/southbridge/amd/sb700/sb700_lpc.c
@@ -42,7 +42,11 @@ static void lpc_init(device_t dev)
pci_write_config32(sm_dev, 0x64, dword);
/* Initialize isa dma */
+#if CONFIG_SOUTHBRIDGE_AMD_SB700_SKIP_ISA_DMA_INIT
+ printk(BIOS_DEBUG, "Skipping isa_dma_init() to avoid getting stuck.\n");
+#else
isa_dma_init();
+#endif
/* Enable DMA transaction on the LPC bus */
byte = pci_read_config8(dev, 0x40);