summaryrefslogtreecommitdiff
path: root/src/northbridge
diff options
context:
space:
mode:
Diffstat (limited to 'src/northbridge')
-rw-r--r--src/northbridge/amd/amdk8/northbridge.c19
-rw-r--r--src/northbridge/amd/amdk8/raminit_f.c2
2 files changed, 1 insertions, 20 deletions
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 7b9621ac10..ab6be96ddb 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -829,9 +829,6 @@ static void setup_uma_memory(void)
#if IS_ENABLED(CONFIG_GFXUMA)
uint32_t topmem = (uint32_t) bsp_topmem();
-#if !IS_ENABLED(CONFIG_BOARD_ASROCK_939A785GMH) && \
- !IS_ENABLED(CONFIG_BOARD_AMD_MAHOGANY)
-
switch (topmem) {
case 0x10000000: /* 256M system memory */
uma_memory_size = 0x2000000; /* 32M recommended UMA */
@@ -849,22 +846,6 @@ static void setup_uma_memory(void)
uma_memory_size = 0x8000000; /* 128M recommended UMA */
break;
}
-#else
- /* refer to UMA Size Consideration in 780 BDG. */
- switch (topmem) {
- case 0x10000000: /* 256M system memory */
- uma_memory_size = 0x4000000; /* 64M recommended UMA */
- break;
-
- case 0x20000000: /* 512M system memory */
- uma_memory_size = 0x8000000; /* 128M recommended UMA */
- break;
-
- default: /* 1GB and above system memory */
- uma_memory_size = 0x10000000; /* 256M recommended UMA */
- break;
- }
-#endif
uma_memory_base = topmem - uma_memory_size; /* TOP_MEM1 */
printk(BIOS_INFO, "%s: uma size 0x%08llx, memory start 0x%08llx\n",
diff --git a/src/northbridge/amd/amdk8/raminit_f.c b/src/northbridge/amd/amdk8/raminit_f.c
index 39c5ad842c..ba17df28f9 100644
--- a/src/northbridge/amd/amdk8/raminit_f.c
+++ b/src/northbridge/amd/amdk8/raminit_f.c
@@ -2348,7 +2348,7 @@ static void set_ecc(const struct mem_controller *ctrl,
dcl &= ~DCL_DimmEccEn;
}
#else // CMOS_VSTART_ECC_memory not defined
-#if !IS_ENABLED(CONFIG_ECC_MEMORY)
+#if 1 // was !IS_ENABLED CONFIG_ECC_MEMORY
dcl &= ~DCL_DimmEccEn;
#endif
#endif