[commit] r6566 - trunk/src/northbridge/amd/amdk8

[repository service]

Author: oxygene
Date: Wed May 11 09:44:27 2011
New Revision: 6566
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6566

Log:
Work around unclean CMOS handling for now

Stefan switched away from #ifdef across the tree (and is absolutely right with that), but
unfortunately there are some special cases that trigger in even more special situations.

Revert one such change selectively. It's destined to go once CMOS is reworked.

Signed-off-by: Patrick Georgi 
Acked-by: Patrick Georgi

Modified:
   trunk/src/northbridge/amd/amdk8/raminit_f.c

Modified: trunk/src/northbridge/amd/amdk8/raminit_f.c
==============================================================================
--- trunk/src/northbridge/amd/amdk8/raminit_f.c	Tue May 10 23:53:13 2011	(r6565)
+++ trunk/src/northbridge/amd/amdk8/raminit_f.c	Wed May 11 09:44:27 2011	(r6566)
@@ -1111,7 +1111,7 @@
    if (read_option(interleave_chip_selects, 1) == 0)
    	return 0;
 #else
-#if !CONFIG_INTERLEAVE_CHIP_SELECTS
+#if !defined(CONFIG_INTERLEAVE_CHIP_SELECTS) || !CONFIG_INTERLEAVE_CHIP_SELECTS
    return 0;
 #endif
 #endif