summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorLi-Ta Lo <ollie@lanl.gov>2004-07-08 16:59:06 +0000
committerLi-Ta Lo <ollie@lanl.gov>2004-07-08 16:59:06 +0000
commit4c5060dc2bf8f944c54361f7913d20d02fff65a0 (patch)
treefdc4af9b051ad8a7f70a73f47d437750440be1d0 /src/mainboard
parentf76a613a9a6cb978ed2d60ea0c5c0a9b195a825b (diff)
downloadcoreboot-4c5060dc2bf8f944c54361f7913d20d02fff65a0.tar.xz
move default_resource_map to its own file
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1623 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/Iwill/DK8S2/auto.c2
-rw-r--r--src/mainboard/Iwill/DK8X/auto.c1
-rw-r--r--src/mainboard/amd/serenade/Config.lb8
-rw-r--r--src/mainboard/amd/serenade/auto.c3
-rw-r--r--src/mainboard/amd/solo/auto.c1
-rw-r--r--src/mainboard/arima/hdama/auto.c4
6 files changed, 11 insertions, 8 deletions
diff --git a/src/mainboard/Iwill/DK8S2/auto.c b/src/mainboard/Iwill/DK8S2/auto.c
index c85baf2b1e..6761646be1 100644
--- a/src/mainboard/Iwill/DK8S2/auto.c
+++ b/src/mainboard/Iwill/DK8S2/auto.c
@@ -99,7 +99,6 @@ static unsigned int generate_row(uint8_t node, uint8_t row, uint8_t maxnodes)
maxnodes=2;
}
-
if (!(node>=maxnodes || row>=maxnodes)) {
ret=rows_2p[node][row];
}
@@ -120,6 +119,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "northbridge/amd/amdk8/raminit.c"
#include "northbridge/amd/amdk8/coherent_ht.c"
#include "sdram/generic_sdram.c"
+#include "northbridge/amd/amdk8/resourcemap.c"
#define FIRST_CPU 1
#define SECOND_CPU 1
diff --git a/src/mainboard/Iwill/DK8X/auto.c b/src/mainboard/Iwill/DK8X/auto.c
index 6626878668..9889f23229 100644
--- a/src/mainboard/Iwill/DK8X/auto.c
+++ b/src/mainboard/Iwill/DK8X/auto.c
@@ -101,6 +101,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "northbridge/amd/amdk8/raminit.c"
#include "northbridge/amd/amdk8/coherent_ht.c"
#include "sdram/generic_sdram.c"
+#include "northbridge/amd/amdk8/resourcemap.c"
static void enable_lapic(void)
{
diff --git a/src/mainboard/amd/serenade/Config.lb b/src/mainboard/amd/serenade/Config.lb
index cc3b039a8d..5b048fb396 100644
--- a/src/mainboard/amd/serenade/Config.lb
+++ b/src/mainboard/amd/serenade/Config.lb
@@ -259,10 +259,10 @@ northbridge amd/amdk8 "mc0"
pci 0:18.2
pci 0:18.3
southbridge amd/amd8131 "amd8131" link 2
- #pci 0:0.0
- #pci 0:0.1
- #pci 0:1.0
- #pci 0:1.1
+ pci 0:0.0
+ pci 0:0.1
+ pci 0:1.0
+ pci 0:1.1
end
southbridge amd/amd8111 "amd8111" link 2
#pci 0:0.0
diff --git a/src/mainboard/amd/serenade/auto.c b/src/mainboard/amd/serenade/auto.c
index f9c0e9b352..85ee737fd1 100644
--- a/src/mainboard/amd/serenade/auto.c
+++ b/src/mainboard/amd/serenade/auto.c
@@ -119,10 +119,9 @@ static inline int spd_read_byte(unsigned device, unsigned address)
}
#include "northbridge/amd/amdk8/raminit.c"
-
#include "northbridge/amd/amdk8/coherent_ht.c"
#include "sdram/generic_sdram.c"
-#include "mainboard/amd/serenade/resourcemap.c"
+#include "resourcemap.c"
#define FIRST_CPU 1
#define SECOND_CPU 1
diff --git a/src/mainboard/amd/solo/auto.c b/src/mainboard/amd/solo/auto.c
index d893b5f8b7..aa1620d2ad 100644
--- a/src/mainboard/amd/solo/auto.c
+++ b/src/mainboard/amd/solo/auto.c
@@ -88,6 +88,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "northbridge/amd/amdk8/raminit.c"
#include "northbridge/amd/amdk8/coherent_ht.c"
#include "sdram/generic_sdram.c"
+#include "northbridge/amd/amdk8/resourcemap.c"
static void main(void)
{
diff --git a/src/mainboard/arima/hdama/auto.c b/src/mainboard/arima/hdama/auto.c
index fd0f90ba07..17b39b9c84 100644
--- a/src/mainboard/arima/hdama/auto.c
+++ b/src/mainboard/arima/hdama/auto.c
@@ -92,6 +92,7 @@ static unsigned int generate_row(uint8_t node, uint8_t row, uint8_t maxnodes)
uint32_t ret = 0x00010101; /* default row entry */
+ /* CPU0 LDT1 <-> LDT1 CPU1 */
static const unsigned int rows_2p[2][2] = {
{ 0x00050101, 0x00010404 },
{ 0x00010404, 0x00050101 }
@@ -102,7 +103,6 @@ static unsigned int generate_row(uint8_t node, uint8_t row, uint8_t maxnodes)
maxnodes = 2;
}
-
if (!(node >= maxnodes || row >= maxnodes)) {
ret = rows_2p[node][row];
}
@@ -123,6 +123,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "northbridge/amd/amdk8/raminit.c"
#include "northbridge/amd/amdk8/coherent_ht.c"
#include "sdram/generic_sdram.c"
+#include "northbridge/amd/amdk8/resourcemap.c"
#define FIRST_CPU 1
#define SECOND_CPU 1
@@ -173,6 +174,7 @@ static void main(void)
setup_default_resource_map();
needs_reset = setup_coherent_ht_domain();
+ /* Non-coherent HT is on LDT0 */
needs_reset |= ht_setup_chain(PCI_DEV(0, 0x18, 0), 0x80);
if (needs_reset) {
print_info("ht reset -\r\n");