Patchwork Move QRANK_DIMM_SUPPORT to Kconfig

login
register
about
Submitter Patrick Georgi
Date 2010-11-05 18:18:34
Message ID <4CD44A7A.2040606@georgi-clan.de>
Download mbox | patch
Permalink /patch/2254/
State Accepted
Headers show

Comments

Patrick Georgi - 2010-11-05 18:18:34
Hi,
see patch. It might be possible to find a better place to this variable
(are "qrank dimms" really a per-board thing?), but for now this should
provide absolutely equivalent to the romstage.c defines.

Move QRANK_DIMM_SUPPORT to Kconfig, removing it from romstage.c

Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Peter Stuge - 2010-11-05 18:20:59
Patrick Georgi wrote:
> (are "qrank dimms" really a per-board thing?)

Which boards do not have the variable set?


//Peter
Patrick Georgi - 2010-11-05 18:27:12
Am 05.11.2010 19:20, schrieb Peter Stuge:
> Patrick Georgi wrote:
>> (are "qrank dimms" really a per-board thing?)
> 
> Which boards do not have the variable set?
About 30, I think. I only did a grep .. | wc -l comparison:

$ grep NORTHBRIDGE_AMD_AMDK8 src/mainboard/*/*/Kconfig |wc -l
86

So 86 boards are eligible for that option.

$ svn st |grep romstage.c |wc -l
63

63 boards have that option dropped (the patch is the only change in that
tree).

So there are 23 boards that do not set it.


Patrick
Scott - 2010-11-05 18:28:59
-----Original Message-----
From: coreboot-bounces@coreboot.org [mailto:coreboot-bounces@coreboot.org] On Behalf Of Peter Stuge
Sent: Friday, November 05, 2010 01:21 PM
To: coreboot@coreboot.org
Subject: Re: [coreboot] [PATCH]Move QRANK_DIMM_SUPPORT to Kconfig

]Patrick Georgi wrote:
]> (are "qrank dimms" really a per-board thing?)
]
]Which boards do not have the variable set?

I am no quad rank dimm expert, but I think few boards support them. One is Serengeti
Cheetah. I remember asking why one processor socket has 4 dimm slots and another 8.
I was told it was for quad rank dimm testing. The chip selects for two normal dimm sockets
are combined and routed to a quad rank socket, if I remember correctly. I don't even
have any quad ranked dimms to test with. I think they are rare.

Thanks,
Scott


]//Peter
Ward Vandewege - 2010-11-05 18:41:55
On Fri, Nov 05, 2010 at 01:28:59PM -0500, Scott Duplichan wrote:
> I am no quad rank dimm expert, but I think few boards support them. One is Serengeti
> Cheetah. I remember asking why one processor socket has 4 dimm slots and another 8.
> I was told it was for quad rank dimm testing. The chip selects for two normal dimm sockets
> are combined and routed to a quad rank socket, if I remember correctly. I don't even
> have any quad ranked dimms to test with. I think they are rare.

Actually, they are not *that* rare, since they are readily available:

  http://www.newegg.com/Product/ProductList.aspx?Submit=ENE&DEPA=0&Order=BESTMATCH&Description=ddr3+quad+rank&x=0&y=0

Thanks,
Ward.
Scott - 2010-11-05 18:58:26
-----Original Message-----
From: Ward Vandewege [mailto:ward@gnu.org] 
Sent: Friday, November 05, 2010 01:42 PM
To: Scott Duplichan
Cc: 'Peter Stuge'; coreboot@coreboot.org
Subject: Re: [coreboot] [PATCH]Move QRANK_DIMM_SUPPORT to Kconfig

]On Fri, Nov 05, 2010 at 01:28:59PM -0500, Scott Duplichan wrote:
]> I am no quad rank dimm expert, but I think few boards support them. One is Serengeti
]> Cheetah. I remember asking why one processor socket has 4 dimm slots and another 8.
]> I was told it was for quad rank dimm testing. The chip selects for two normal dimm sockets
]> are combined and routed to a quad rank socket, if I remember correctly. I don't even
]> have any quad ranked dimms to test with. I think they are rare.
]
]Actually, they are not *that* rare, since they are readily available:
]
]  ]http://www.newegg.com/Product/ProductList.aspx?Submit=ENE&DEPA=0&Order=BESTMATCH&Description=ddr3]+quad+rank&x=0&y=0

Sure enough. And not a bad price (per MB), either. Thanks for pointing them out.

Though I would question the maturity of coreboot support for registered
DDR3 in general, and specifically for 1333 speed or quad rank. I believe
these were perfected internally at AMD only recently. How well has coreboot
been tested with various speeds of registered DDR3? There is a lot more
complexity in the memory init code when registered DIMMs of any rank count
are used. And there is still the question of what boards supported by coreboot
really have hardware support for quadrank. I would hate to mislead someone
into buying a system loaded with registered memory with the idea of running
coreboot, unless it is known to work.

Thanks,
Scott

]-- 
]Ward Vandewege <ward@fsf.org>
]Free Software Foundation - Senior Systems Administrator
Patrick Georgi - 2010-11-05 19:05:41
Am 05.11.2010 19:58, schrieb Scott Duplichan:
> really have hardware support for quadrank. I would hate to mislead someone
> into buying a system loaded with registered memory with the idea of running
> coreboot, unless it is known to work.
I think (and hope) that I didn't mark any board as quad rank capable
that wasn't marked that way before, but I can't tell if the original
options are set correctly.

In this regard, the tree with this patch is as good as without.


Patrick
Myles Watson - 2010-11-05 19:15:15
> Am 05.11.2010 19:58, schrieb Scott Duplichan:
> > really have hardware support for quadrank. I would hate to mislead
> someone
> > into buying a system loaded with registered memory with the idea of
> running
> > coreboot, unless it is known to work.
> I think (and hope) that I didn't mark any board as quad rank capable
> that wasn't marked that way before, but I can't tell if the original
> options are set correctly.
> 
> In this regard, the tree with this patch is as good as without.
Agreed.

Acked-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles

Patch

Index: src/mainboard/iwill/dk8_htx/Kconfig

===================================================================
--- src/mainboard/iwill/dk8_htx/Kconfig	(Revision 6027)

+++ src/mainboard/iwill/dk8_htx/Kconfig	(Arbeitskopie)

@@ -21,6 +21,7 @@ 

 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/iwill/dk8_htx/romstage.c

===================================================================
--- src/mainboard/iwill/dk8_htx/romstage.c	(Revision 6027)

+++ src/mainboard/iwill/dk8_htx/romstage.c	(Arbeitskopie)

@@ -1,7 +1,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
 //#define K8_ALLOCATE_IO_RANGE 1
Index: src/mainboard/iwill/dk8s2/Kconfig

===================================================================
--- src/mainboard/iwill/dk8s2/Kconfig	(Revision 6027)

+++ src/mainboard/iwill/dk8s2/Kconfig	(Arbeitskopie)

@@ -18,6 +18,7 @@ 

 	select ATI_RAGE_XL
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/iwill/dk8s2/romstage.c

===================================================================
--- src/mainboard/iwill/dk8s2/romstage.c	(Revision 6027)

+++ src/mainboard/iwill/dk8s2/romstage.c	(Arbeitskopie)

@@ -1,7 +1,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
 //#define K8_ALLOCATE_IO_RANGE 1
Index: src/mainboard/iwill/dk8x/Kconfig

===================================================================
--- src/mainboard/iwill/dk8x/Kconfig	(Revision 6027)

+++ src/mainboard/iwill/dk8x/Kconfig	(Arbeitskopie)

@@ -17,6 +17,7 @@ 

 	select WAIT_BEFORE_CPUS_INIT
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/iwill/dk8x/romstage.c

===================================================================
--- src/mainboard/iwill/dk8x/romstage.c	(Revision 6027)

+++ src/mainboard/iwill/dk8x/romstage.c	(Arbeitskopie)

@@ -1,7 +1,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
 //#define K8_ALLOCATE_IO_RANGE 1
Index: src/mainboard/asrock/939a785gmh/Kconfig

===================================================================
--- src/mainboard/asrock/939a785gmh/Kconfig	(Revision 6027)

+++ src/mainboard/asrock/939a785gmh/Kconfig	(Arbeitskopie)

@@ -24,6 +24,7 @@ 

 	select BOARD_ROMSIZE_KB_1024
 	select GFXUMA
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/asrock/939a785gmh/romstage.c

===================================================================
--- src/mainboard/asrock/939a785gmh/romstage.c	(Revision 6027)

+++ src/mainboard/asrock/939a785gmh/romstage.c	(Arbeitskopie)

@@ -19,7 +19,6 @@ 

  */
 
 #define SET_FIDVID 1
-#define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
 #endif
Index: src/mainboard/broadcom/blast/Kconfig

===================================================================
--- src/mainboard/broadcom/blast/Kconfig	(Revision 6027)

+++ src/mainboard/broadcom/blast/Kconfig	(Arbeitskopie)

@@ -16,6 +16,7 @@ 

 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/broadcom/blast/romstage.c

===================================================================
--- src/mainboard/broadcom/blast/romstage.c	(Revision 6027)

+++ src/mainboard/broadcom/blast/romstage.c	(Arbeitskopie)

@@ -1,4 +1,3 @@ 

-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/supermicro/h8dmr/Kconfig

===================================================================
--- src/mainboard/supermicro/h8dmr/Kconfig	(Revision 6027)

+++ src/mainboard/supermicro/h8dmr/Kconfig	(Arbeitskopie)

@@ -21,6 +21,7 @@ 

 	select LIFT_BSP_APIC_ID
 	select BOARD_ROMSIZE_KB_1024
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/supermicro/h8dmr/ap_romstage.c

===================================================================
--- src/mainboard/supermicro/h8dmr/ap_romstage.c	(Revision 6027)

+++ src/mainboard/supermicro/h8dmr/ap_romstage.c	(Arbeitskopie)

@@ -25,7 +25,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 #define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
 
Index: src/mainboard/supermicro/h8dmr/romstage.c

===================================================================
--- src/mainboard/supermicro/h8dmr/romstage.c	(Revision 6027)

+++ src/mainboard/supermicro/h8dmr/romstage.c	(Arbeitskopie)

@@ -21,7 +21,6 @@ 

 
 #define K8_ALLOCATE_IO_RANGE 1
 
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/supermicro/h8dme/Kconfig

===================================================================
--- src/mainboard/supermicro/h8dme/Kconfig	(Revision 6027)

+++ src/mainboard/supermicro/h8dme/Kconfig	(Arbeitskopie)

@@ -22,6 +22,7 @@ 

 	select LIFT_BSP_APIC_ID
 	select BOARD_ROMSIZE_KB_1024
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/supermicro/h8dme/ap_romstage.c

===================================================================
--- src/mainboard/supermicro/h8dme/ap_romstage.c	(Revision 6027)

+++ src/mainboard/supermicro/h8dme/ap_romstage.c	(Arbeitskopie)

@@ -25,7 +25,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 #define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
 
Index: src/mainboard/supermicro/h8dme/romstage.c

===================================================================
--- src/mainboard/supermicro/h8dme/romstage.c	(Revision 6027)

+++ src/mainboard/supermicro/h8dme/romstage.c	(Arbeitskopie)

@@ -18,7 +18,6 @@ 

 
 #define K8_ALLOCATE_IO_RANGE 1
 
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/supermicro/h8dmr_fam10/Kconfig

===================================================================
--- src/mainboard/supermicro/h8dmr_fam10/Kconfig	(Revision 6027)

+++ src/mainboard/supermicro/h8dmr_fam10/Kconfig	(Arbeitskopie)

@@ -23,6 +23,7 @@ 

 	select RAMINIT_SYSINFO
 	select TINY_BOOTBLOCK
 	select ENABLE_APIC_EXT_ID
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/supermicro/h8dmr_fam10/romstage.c

===================================================================
--- src/mainboard/supermicro/h8dmr_fam10/romstage.c	(Revision 6027)

+++ src/mainboard/supermicro/h8dmr_fam10/romstage.c	(Arbeitskopie)

@@ -22,7 +22,6 @@ 

 #define FAM10_SCAN_PCI_BUS 0
 #define FAM10_ALLOCATE_IO_RANGE 1
 
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/supermicro/h8qme_fam10/Kconfig

===================================================================
--- src/mainboard/supermicro/h8qme_fam10/Kconfig	(Revision 6027)

+++ src/mainboard/supermicro/h8qme_fam10/Kconfig	(Arbeitskopie)

@@ -22,6 +22,7 @@ 

 	select RAMINIT_SYSINFO
 	select TINY_BOOTBLOCK
 	select ENABLE_APIC_EXT_ID
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/supermicro/h8qme_fam10/romstage.c

===================================================================
--- src/mainboard/supermicro/h8qme_fam10/romstage.c	(Revision 6027)

+++ src/mainboard/supermicro/h8qme_fam10/romstage.c	(Arbeitskopie)

@@ -22,7 +22,6 @@ 

 #define FAM10_SCAN_PCI_BUS 0
 #define FAM10_ALLOCATE_IO_RANGE 1
 
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/kontron/kt690/Kconfig

===================================================================
--- src/mainboard/kontron/kt690/Kconfig	(Revision 6027)

+++ src/mainboard/kontron/kt690/Kconfig	(Arbeitskopie)

@@ -22,6 +22,7 @@ 

 	select BOARD_ROMSIZE_KB_1024
 	select RAMINIT_SYSINFO
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/kontron/kt690/romstage.c

===================================================================
--- src/mainboard/kontron/kt690/romstage.c	(Revision 6027)

+++ src/mainboard/kontron/kt690/romstage.c	(Arbeitskopie)

@@ -19,7 +19,6 @@ 

  */
 
 #define SET_FIDVID 1
-#define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
 #endif
Index: src/mainboard/gigabyte/m57sli/Kconfig

===================================================================
--- src/mainboard/gigabyte/m57sli/Kconfig	(Revision 6027)

+++ src/mainboard/gigabyte/m57sli/Kconfig	(Arbeitskopie)

@@ -23,6 +23,7 @@ 

 	select K8_REV_F_SUPPORT
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/gigabyte/m57sli/ap_romstage.c

===================================================================
--- src/mainboard/gigabyte/m57sli/ap_romstage.c	(Revision 6027)

+++ src/mainboard/gigabyte/m57sli/ap_romstage.c	(Arbeitskopie)

@@ -25,7 +25,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 #define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
 
Index: src/mainboard/gigabyte/m57sli/romstage.c

===================================================================
--- src/mainboard/gigabyte/m57sli/romstage.c	(Revision 6027)

+++ src/mainboard/gigabyte/m57sli/romstage.c	(Arbeitskopie)

@@ -21,7 +21,6 @@ 

 
 #define K8_ALLOCATE_IO_RANGE 1
 
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/gigabyte/ma78gm/Kconfig

===================================================================
--- src/mainboard/gigabyte/ma78gm/Kconfig	(Revision 6027)

+++ src/mainboard/gigabyte/ma78gm/Kconfig	(Arbeitskopie)

@@ -28,6 +28,7 @@ 

 	select TINY_BOOTBLOCK
 	select GFXUMA
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/gigabyte/ma78gm/romstage.c

===================================================================
--- src/mainboard/gigabyte/ma78gm/romstage.c	(Revision 6027)

+++ src/mainboard/gigabyte/ma78gm/romstage.c	(Arbeitskopie)

@@ -24,7 +24,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
 #define FAM10_SCAN_PCI_BUS 0
Index: src/mainboard/gigabyte/ga_2761gxdk/Kconfig

===================================================================
--- src/mainboard/gigabyte/ga_2761gxdk/Kconfig	(Revision 6027)

+++ src/mainboard/gigabyte/ga_2761gxdk/Kconfig	(Arbeitskopie)

@@ -19,6 +19,7 @@ 

 	select K8_REV_F_SUPPORT
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c

===================================================================
--- src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c	(Revision 6027)

+++ src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c	(Arbeitskopie)

@@ -27,7 +27,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 #define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
 
Index: src/mainboard/gigabyte/ga_2761gxdk/romstage.c

===================================================================
--- src/mainboard/gigabyte/ga_2761gxdk/romstage.c	(Revision 6027)

+++ src/mainboard/gigabyte/ga_2761gxdk/romstage.c	(Arbeitskopie)

@@ -23,7 +23,6 @@ 

 
 #define K8_ALLOCATE_IO_RANGE 1
 
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/gigabyte/ma785gmt/Kconfig

===================================================================
--- src/mainboard/gigabyte/ma785gmt/Kconfig	(Revision 6027)

+++ src/mainboard/gigabyte/ma785gmt/Kconfig	(Arbeitskopie)

@@ -28,6 +28,7 @@ 

 	select TINY_BOOTBLOCK
 	select GFXUMA
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/gigabyte/ma785gmt/romstage.c

===================================================================
--- src/mainboard/gigabyte/ma785gmt/romstage.c	(Revision 6027)

+++ src/mainboard/gigabyte/ma785gmt/romstage.c	(Arbeitskopie)

@@ -24,7 +24,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 //used by init_cpus and fidvid
 #define SET_FIDVID 1
Index: src/mainboard/amd/mahogany/Kconfig

===================================================================
--- src/mainboard/amd/mahogany/Kconfig	(Revision 6027)

+++ src/mainboard/amd/mahogany/Kconfig	(Arbeitskopie)

@@ -24,6 +24,7 @@ 

 	select BOARD_ROMSIZE_KB_1024
 	select RAMINIT_SYSINFO
 	select GFXUMA
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/amd/mahogany/romstage.c

===================================================================
--- src/mainboard/amd/mahogany/romstage.c	(Revision 6027)

+++ src/mainboard/amd/mahogany/romstage.c	(Arbeitskopie)

@@ -18,7 +18,6 @@ 

  */
 
 #define SET_FIDVID 1
-#define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
 #endif
Index: src/mainboard/amd/pistachio/Kconfig

===================================================================
--- src/mainboard/amd/pistachio/Kconfig	(Revision 6027)

+++ src/mainboard/amd/pistachio/Kconfig	(Arbeitskopie)

@@ -21,6 +21,7 @@ 

 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_1024
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/amd/pistachio/romstage.c

===================================================================
--- src/mainboard/amd/pistachio/romstage.c	(Revision 6027)

+++ src/mainboard/amd/pistachio/romstage.c	(Arbeitskopie)

@@ -18,7 +18,6 @@ 

  */
 
 #define SET_FIDVID 1
-#define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
 #endif
Index: src/mainboard/amd/dbm690t/Kconfig

===================================================================
--- src/mainboard/amd/dbm690t/Kconfig	(Revision 6027)

+++ src/mainboard/amd/dbm690t/Kconfig	(Arbeitskopie)

@@ -21,6 +21,7 @@ 

 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select BOARD_ROMSIZE_KB_1024
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/amd/dbm690t/romstage.c

===================================================================
--- src/mainboard/amd/dbm690t/romstage.c	(Revision 6027)

+++ src/mainboard/amd/dbm690t/romstage.c	(Arbeitskopie)

@@ -18,7 +18,6 @@ 

  */
 
 #define SET_FIDVID 1
-#define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
 #endif
Index: src/mainboard/amd/serengeti_cheetah/Kconfig

===================================================================
--- src/mainboard/amd/serengeti_cheetah/Kconfig	(Revision 6027)

+++ src/mainboard/amd/serengeti_cheetah/Kconfig	(Arbeitskopie)

@@ -25,6 +25,7 @@ 

 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/amd/serengeti_cheetah/ap_romstage.c

===================================================================
--- src/mainboard/amd/serengeti_cheetah/ap_romstage.c	(Revision 6027)

+++ src/mainboard/amd/serengeti_cheetah/ap_romstage.c	(Arbeitskopie)

@@ -4,7 +4,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 #define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
 
Index: src/mainboard/amd/serengeti_cheetah/romstage.c

===================================================================
--- src/mainboard/amd/serengeti_cheetah/romstage.c	(Revision 6027)

+++ src/mainboard/amd/serengeti_cheetah/romstage.c	(Arbeitskopie)

@@ -1,7 +1,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
 //#define K8_ALLOCATE_IO_RANGE 1
Index: src/mainboard/amd/mahogany_fam10/Kconfig

===================================================================
--- src/mainboard/amd/mahogany_fam10/Kconfig	(Revision 6027)

+++ src/mainboard/amd/mahogany_fam10/Kconfig	(Arbeitskopie)

@@ -28,6 +28,7 @@ 

 	select ENABLE_APIC_EXT_ID
 	select TINY_BOOTBLOCK
 	select GFXUMA
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/amd/mahogany_fam10/romstage.c

===================================================================
--- src/mainboard/amd/mahogany_fam10/romstage.c	(Revision 6027)

+++ src/mainboard/amd/mahogany_fam10/romstage.c	(Arbeitskopie)

@@ -24,7 +24,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
 #define FAM10_SCAN_PCI_BUS 0
Index: src/mainboard/amd/tilapia_fam10/Kconfig

===================================================================
--- src/mainboard/amd/tilapia_fam10/Kconfig	(Revision 6027)

+++ src/mainboard/amd/tilapia_fam10/Kconfig	(Arbeitskopie)

@@ -28,6 +28,7 @@ 

 	select ENABLE_APIC_EXT_ID
 	select TINY_BOOTBLOCK
 	select GFXUMA
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/amd/tilapia_fam10/romstage.c

===================================================================
--- src/mainboard/amd/tilapia_fam10/romstage.c	(Revision 6027)

+++ src/mainboard/amd/tilapia_fam10/romstage.c	(Arbeitskopie)

@@ -24,7 +24,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
 #define FAM10_SCAN_PCI_BUS 0
Index: src/mainboard/amd/serengeti_cheetah_fam10/Kconfig

===================================================================
--- src/mainboard/amd/serengeti_cheetah_fam10/Kconfig	(Revision 6027)

+++ src/mainboard/amd/serengeti_cheetah_fam10/Kconfig	(Arbeitskopie)

@@ -26,6 +26,7 @@ 

 	select ENABLE_APIC_EXT_ID
 	select LIFT_BSP_APIC_ID
 	select TINY_BOOTBLOCK
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/amd/serengeti_cheetah_fam10/romstage.c

===================================================================
--- src/mainboard/amd/serengeti_cheetah_fam10/romstage.c	(Revision 6027)

+++ src/mainboard/amd/serengeti_cheetah_fam10/romstage.c	(Arbeitskopie)

@@ -24,7 +24,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
 #define FAM10_SCAN_PCI_BUS 0
Index: src/mainboard/iei/kino-780am2-fam10/Kconfig

===================================================================
--- src/mainboard/iei/kino-780am2-fam10/Kconfig	(Revision 6027)

+++ src/mainboard/iei/kino-780am2-fam10/Kconfig	(Arbeitskopie)

@@ -28,6 +28,7 @@ 

 	select ENABLE_APIC_EXT_ID
 	select TINY_BOOTBLOCK
 	select GFXUMA
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/iei/kino-780am2-fam10/romstage.c

===================================================================
--- src/mainboard/iei/kino-780am2-fam10/romstage.c	(Revision 6027)

+++ src/mainboard/iei/kino-780am2-fam10/romstage.c	(Arbeitskopie)

@@ -24,7 +24,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
 #define FAM10_SCAN_PCI_BUS 0
Index: src/mainboard/hp/dl145_g1/Kconfig

===================================================================
--- src/mainboard/hp/dl145_g1/Kconfig	(Revision 6027)

+++ src/mainboard/hp/dl145_g1/Kconfig	(Arbeitskopie)

@@ -16,6 +16,7 @@ 

 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_512
 #	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/hp/dl145_g1/romstage.c

===================================================================
--- src/mainboard/hp/dl145_g1/romstage.c	(Revision 6027)

+++ src/mainboard/hp/dl145_g1/romstage.c	(Arbeitskopie)

@@ -1,4 +1,3 @@ 

-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/hp/dl145_g3/Kconfig

===================================================================
--- src/mainboard/hp/dl145_g3/Kconfig	(Revision 6027)

+++ src/mainboard/hp/dl145_g3/Kconfig	(Arbeitskopie)

@@ -21,6 +21,7 @@ 

 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/hp/dl145_g3/romstage.c

===================================================================
--- src/mainboard/hp/dl145_g3/romstage.c	(Revision 6027)

+++ src/mainboard/hp/dl145_g3/romstage.c	(Arbeitskopie)

@@ -27,7 +27,6 @@ 

 
 #define K8_ALLOCATE_IO_RANGE 1
 
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/hp/dl165_g6_fam10/Kconfig

===================================================================
--- src/mainboard/hp/dl165_g6_fam10/Kconfig	(Revision 6027)

+++ src/mainboard/hp/dl165_g6_fam10/Kconfig	(Arbeitskopie)

@@ -23,6 +23,7 @@ 

 	select ENABLE_APIC_EXT_ID
 	select AMDMCT
 	select TINY_BOOTBLOCK
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/hp/dl165_g6_fam10/romstage.c

===================================================================
--- src/mainboard/hp/dl165_g6_fam10/romstage.c	(Revision 6027)

+++ src/mainboard/hp/dl165_g6_fam10/romstage.c	(Arbeitskopie)

@@ -28,7 +28,6 @@ 

 #define FAM10_SCAN_PCI_BUS 0
 #define FAM10_ALLOCATE_IO_RANGE 1
 
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/tyan/s2912/Kconfig

===================================================================
--- src/mainboard/tyan/s2912/Kconfig	(Revision 6027)

+++ src/mainboard/tyan/s2912/Kconfig	(Arbeitskopie)

@@ -21,6 +21,7 @@ 

 	select K8_REV_F_SUPPORT
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/tyan/s2912/ap_romstage.c

===================================================================
--- src/mainboard/tyan/s2912/ap_romstage.c	(Revision 6027)

+++ src/mainboard/tyan/s2912/ap_romstage.c	(Arbeitskopie)

@@ -25,7 +25,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 #define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
 
Index: src/mainboard/tyan/s2912/romstage.c

===================================================================
--- src/mainboard/tyan/s2912/romstage.c	(Revision 6027)

+++ src/mainboard/tyan/s2912/romstage.c	(Arbeitskopie)

@@ -21,7 +21,6 @@ 

 
 #define K8_ALLOCATE_IO_RANGE 1
 
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/tyan/s2880/Kconfig

===================================================================
--- src/mainboard/tyan/s2880/Kconfig	(Revision 6027)

+++ src/mainboard/tyan/s2880/Kconfig	(Arbeitskopie)

@@ -15,6 +15,7 @@ 

 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/tyan/s2880/romstage.c

===================================================================
--- src/mainboard/tyan/s2880/romstage.c	(Revision 6027)

+++ src/mainboard/tyan/s2880/romstage.c	(Arbeitskopie)

@@ -62,7 +62,6 @@ 

 	return smbus_read_byte(device, address);
 }
 
-#define QRANK_DIMM_SUPPORT 1
 
 #include "northbridge/amd/amdk8/raminit.c"
 #include "northbridge/amd/amdk8/resourcemap.c"
Index: src/mainboard/tyan/s2881/Kconfig

===================================================================
--- src/mainboard/tyan/s2881/Kconfig	(Revision 6027)

+++ src/mainboard/tyan/s2881/Kconfig	(Arbeitskopie)

@@ -17,6 +17,7 @@ 

 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select DRIVERS_SIL_3114
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/tyan/s2881/romstage.c

===================================================================
--- src/mainboard/tyan/s2881/romstage.c	(Revision 6027)

+++ src/mainboard/tyan/s2881/romstage.c	(Arbeitskopie)

@@ -1,4 +1,3 @@ 

-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/tyan/s4880/Kconfig

===================================================================
--- src/mainboard/tyan/s4880/Kconfig	(Revision 6027)

+++ src/mainboard/tyan/s4880/Kconfig	(Arbeitskopie)

@@ -15,6 +15,7 @@ 

 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/tyan/s4880/romstage.c

===================================================================
--- src/mainboard/tyan/s4880/romstage.c	(Revision 6027)

+++ src/mainboard/tyan/s4880/romstage.c	(Arbeitskopie)

@@ -76,7 +76,6 @@ 

 	return smbus_read_byte(device, address);
 }
 
-#define QRANK_DIMM_SUPPORT 1
 
 #include "northbridge/amd/amdk8/raminit.c"
 #include "northbridge/amd/amdk8/coherent_ht.c"
Index: src/mainboard/tyan/s2891/Kconfig

===================================================================
--- src/mainboard/tyan/s2891/Kconfig	(Revision 6027)

+++ src/mainboard/tyan/s2891/Kconfig	(Arbeitskopie)

@@ -18,6 +18,7 @@ 

 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/tyan/s2891/romstage.c

===================================================================
--- src/mainboard/tyan/s2891/romstage.c	(Revision 6027)

+++ src/mainboard/tyan/s2891/romstage.c	(Arbeitskopie)

@@ -1,5 +1,4 @@ 

 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/tyan/s2882/Kconfig

===================================================================
--- src/mainboard/tyan/s2882/Kconfig	(Revision 6027)

+++ src/mainboard/tyan/s2882/Kconfig	(Arbeitskopie)

@@ -16,6 +16,7 @@ 

 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select DRIVERS_SIL_3114
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/tyan/s2882/romstage.c

===================================================================
--- src/mainboard/tyan/s2882/romstage.c	(Revision 6027)

+++ src/mainboard/tyan/s2882/romstage.c	(Arbeitskopie)

@@ -62,7 +62,6 @@ 

 	return smbus_read_byte(device, address);
 }
 
-#define QRANK_DIMM_SUPPORT 1
 
 #include "northbridge/amd/amdk8/raminit.c"
 #include "northbridge/amd/amdk8/resourcemap.c"
Index: src/mainboard/tyan/s2892/Kconfig

===================================================================
--- src/mainboard/tyan/s2892/Kconfig	(Revision 6027)

+++ src/mainboard/tyan/s2892/Kconfig	(Arbeitskopie)

@@ -17,6 +17,7 @@ 

 	select SERIAL_CPU_INIT
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_1024
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/tyan/s2892/romstage.c

===================================================================
--- src/mainboard/tyan/s2892/romstage.c	(Revision 6027)

+++ src/mainboard/tyan/s2892/romstage.c	(Arbeitskopie)

@@ -1,4 +1,3 @@ 

-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/tyan/s4882/Kconfig

===================================================================
--- src/mainboard/tyan/s4882/Kconfig	(Revision 6027)

+++ src/mainboard/tyan/s4882/Kconfig	(Arbeitskopie)

@@ -15,6 +15,7 @@ 

 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/tyan/s4882/romstage.c

===================================================================
--- src/mainboard/tyan/s4882/romstage.c	(Revision 6027)

+++ src/mainboard/tyan/s4882/romstage.c	(Arbeitskopie)

@@ -84,7 +84,6 @@ 

 	return smbus_read_byte(device, address);
 }
 
-#define QRANK_DIMM_SUPPORT 1
 
 #include "northbridge/amd/amdk8/raminit.c"
 #include "northbridge/amd/amdk8/coherent_ht.c"
Index: src/mainboard/tyan/s2875/Kconfig

===================================================================
--- src/mainboard/tyan/s2875/Kconfig	(Revision 6027)

+++ src/mainboard/tyan/s2875/Kconfig	(Arbeitskopie)

@@ -15,6 +15,7 @@ 

 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/tyan/s2875/romstage.c

===================================================================
--- src/mainboard/tyan/s2875/romstage.c	(Revision 6027)

+++ src/mainboard/tyan/s2875/romstage.c	(Arbeitskopie)

@@ -62,7 +62,6 @@ 

 	return smbus_read_byte(device, address);
 }
 
-#define QRANK_DIMM_SUPPORT 1
 
 #include "northbridge/amd/amdk8/raminit.c"
 #include "northbridge/amd/amdk8/coherent_ht.c"
Index: src/mainboard/tyan/s2885/Kconfig

===================================================================
--- src/mainboard/tyan/s2885/Kconfig	(Revision 6027)

+++ src/mainboard/tyan/s2885/Kconfig	(Arbeitskopie)

@@ -17,6 +17,7 @@ 

 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/tyan/s2885/romstage.c

===================================================================
--- src/mainboard/tyan/s2885/romstage.c	(Revision 6027)

+++ src/mainboard/tyan/s2885/romstage.c	(Arbeitskopie)

@@ -62,7 +62,6 @@ 

 	return smbus_read_byte(device, address);
 }
 
-#define QRANK_DIMM_SUPPORT 1
 
 #include "northbridge/amd/amdk8/raminit.c"
 #include "northbridge/amd/amdk8/coherent_ht.c"
Index: src/mainboard/tyan/s2895/Kconfig

===================================================================
--- src/mainboard/tyan/s2895/Kconfig	(Revision 6027)

+++ src/mainboard/tyan/s2895/Kconfig	(Arbeitskopie)

@@ -17,6 +17,7 @@ 

 	select SERIAL_CPU_INIT
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_1024
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/tyan/s2895/romstage.c

===================================================================
--- src/mainboard/tyan/s2895/romstage.c	(Revision 6027)

+++ src/mainboard/tyan/s2895/romstage.c	(Arbeitskopie)

@@ -1,6 +1,5 @@ 

 #define K8_ALLOCATE_IO_RANGE 1
 
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/tyan/s2912_fam10/Kconfig

===================================================================
--- src/mainboard/tyan/s2912_fam10/Kconfig	(Revision 6027)

+++ src/mainboard/tyan/s2912_fam10/Kconfig	(Arbeitskopie)

@@ -23,6 +23,7 @@ 

 	select AMDMCT
 	select TINY_BOOTBLOCK
 	select MMCONF_SUPPORT_DEFAULT
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/tyan/s2912_fam10/romstage.c

===================================================================
--- src/mainboard/tyan/s2912_fam10/romstage.c	(Revision 6027)

+++ src/mainboard/tyan/s2912_fam10/romstage.c	(Arbeitskopie)

@@ -22,7 +22,6 @@ 

 #define FAM10_SCAN_PCI_BUS 0
 #define FAM10_ALLOCATE_IO_RANGE 1
 
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/msi/ms7135/Kconfig

===================================================================
--- src/mainboard/msi/ms7135/Kconfig	(Revision 6027)

+++ src/mainboard/msi/ms7135/Kconfig	(Arbeitskopie)

@@ -16,6 +16,7 @@ 

 	select BOARD_ROMSIZE_KB_512
 	select CK804_USE_NIC
 	select CK804_USE_ACI
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/msi/ms7135/romstage.c

===================================================================
--- src/mainboard/msi/ms7135/romstage.c	(Revision 6027)

+++ src/mainboard/msi/ms7135/romstage.c	(Arbeitskopie)

@@ -25,7 +25,6 @@ 

 #define SERIAL_DEV PNP_DEV(0x4e, W83627THF_SP1)
 
 /* Used by raminit. */
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS == 1
 #define SET_NB_CFG_54 1
Index: src/mainboard/msi/ms9282/Kconfig

===================================================================
--- src/mainboard/msi/ms9282/Kconfig	(Revision 6027)

+++ src/mainboard/msi/ms9282/Kconfig	(Arbeitskopie)

@@ -19,6 +19,7 @@ 

 	select K8_REV_F_SUPPORT
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/msi/ms9282/romstage.c

===================================================================
--- src/mainboard/msi/ms9282/romstage.c	(Revision 6027)

+++ src/mainboard/msi/ms9282/romstage.c	(Arbeitskopie)

@@ -25,7 +25,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 // used by init_cpus and fidvid (disabled until someone tests this)
 // #define SET_FIDVID 1
Index: src/mainboard/msi/ms9185/Kconfig

===================================================================
--- src/mainboard/msi/ms9185/Kconfig	(Revision 6027)

+++ src/mainboard/msi/ms9185/Kconfig	(Arbeitskopie)

@@ -21,6 +21,7 @@ 

 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/msi/ms9185/romstage.c

===================================================================
--- src/mainboard/msi/ms9185/romstage.c	(Revision 6027)

+++ src/mainboard/msi/ms9185/romstage.c	(Arbeitskopie)

@@ -26,7 +26,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
 //#define K8_ALLOCATE_IO_RANGE 1
Index: src/mainboard/msi/ms9652_fam10/Kconfig

===================================================================
--- src/mainboard/msi/ms9652_fam10/Kconfig	(Revision 6027)

+++ src/mainboard/msi/ms9652_fam10/Kconfig	(Arbeitskopie)

@@ -24,6 +24,7 @@ 

 	select AMDMCT
 	select TINY_BOOTBLOCK
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/msi/ms9652_fam10/romstage.c

===================================================================
--- src/mainboard/msi/ms9652_fam10/romstage.c	(Revision 6027)

+++ src/mainboard/msi/ms9652_fam10/romstage.c	(Arbeitskopie)

@@ -22,7 +22,6 @@ 

 #define FAM10_SCAN_PCI_BUS 0
 #define FAM10_ALLOCATE_IO_RANGE 1
 
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/msi/ms7260/Kconfig

===================================================================
--- src/mainboard/msi/ms7260/Kconfig	(Revision 6027)

+++ src/mainboard/msi/ms7260/Kconfig	(Arbeitskopie)

@@ -21,6 +21,7 @@ 

 	select K8_REV_F_SUPPORT
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/msi/ms7260/ap_romstage.c

===================================================================
--- src/mainboard/msi/ms7260/ap_romstage.c	(Revision 6027)

+++ src/mainboard/msi/ms7260/ap_romstage.c	(Arbeitskopie)

@@ -24,7 +24,6 @@ 

 #define __PRE_RAM__
 
 #define SET_NB_CFG_54 1			/* Used by RAM init. */
-#define QRANK_DIMM_SUPPORT 1
 #define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
 
 #include <stdint.h>
Index: src/mainboard/msi/ms7260/romstage.c

===================================================================
--- src/mainboard/msi/ms7260/romstage.c	(Revision 6027)

+++ src/mainboard/msi/ms7260/romstage.c	(Arbeitskopie)

@@ -25,7 +25,6 @@ 

 // #define RES_DEBUG 1
 
 #define K8_ALLOCATE_IO_RANGE 1
-#define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS == 1
 #define SET_NB_CFG_54 1
 #endif
Index: src/mainboard/arima/hdama/Kconfig

===================================================================
--- src/mainboard/arima/hdama/Kconfig	(Revision 6027)

+++ src/mainboard/arima/hdama/Kconfig	(Arbeitskopie)

@@ -15,6 +15,7 @@ 

 	select HAVE_HARD_RESET
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select BOARD_ROMSIZE_KB_512
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/arima/hdama/romstage.c

===================================================================
--- src/mainboard/arima/hdama/romstage.c	(Revision 6027)

+++ src/mainboard/arima/hdama/romstage.c	(Arbeitskopie)

@@ -67,7 +67,6 @@ 

 	return smbus_read_byte(device, address);
 }
 
-#define QRANK_DIMM_SUPPORT 1
 
 #include "northbridge/amd/amdk8/raminit.c"
 #include "northbridge/amd/amdk8/resourcemap.c"
Index: src/mainboard/sunw/ultra40/Kconfig

===================================================================
--- src/mainboard/sunw/ultra40/Kconfig	(Revision 6027)

+++ src/mainboard/sunw/ultra40/Kconfig	(Arbeitskopie)

@@ -16,6 +16,7 @@ 

 	select BOARD_ROMSIZE_KB_1024
 	select CK804_USE_NIC
 	select CK804_USE_ACI
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/sunw/ultra40/romstage.c

===================================================================
--- src/mainboard/sunw/ultra40/romstage.c	(Revision 6027)

+++ src/mainboard/sunw/ultra40/romstage.c	(Arbeitskopie)

@@ -1,6 +1,5 @@ 

 #define K8_ALLOCATE_IO_RANGE 1
 
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/newisys/khepri/Kconfig

===================================================================
--- src/mainboard/newisys/khepri/Kconfig	(Revision 6027)

+++ src/mainboard/newisys/khepri/Kconfig	(Arbeitskopie)

@@ -15,6 +15,7 @@ 

 	select HAVE_HARD_RESET
 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/newisys/khepri/romstage.c

===================================================================
--- src/mainboard/newisys/khepri/romstage.c	(Revision 6027)

+++ src/mainboard/newisys/khepri/romstage.c	(Arbeitskopie)

@@ -72,7 +72,6 @@ 

 	return smbus_read_byte(device, address);
 }
 
-#define QRANK_DIMM_SUPPORT 1
 
 #include "northbridge/amd/amdk8/raminit.c"
 #include "northbridge/amd/amdk8/coherent_ht.c"
Index: src/mainboard/jetway/pa78vm5/Kconfig

===================================================================
--- src/mainboard/jetway/pa78vm5/Kconfig	(Revision 6027)

+++ src/mainboard/jetway/pa78vm5/Kconfig	(Arbeitskopie)

@@ -28,6 +28,7 @@ 

 	select ENABLE_APIC_EXT_ID
 	select TINY_BOOTBLOCK
 	select GFXUMA
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/jetway/pa78vm5/romstage.c

===================================================================
--- src/mainboard/jetway/pa78vm5/romstage.c	(Revision 6027)

+++ src/mainboard/jetway/pa78vm5/romstage.c	(Arbeitskopie)

@@ -25,7 +25,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
 #define FAM10_SCAN_PCI_BUS 0
Index: src/mainboard/technexion/tim8690/Kconfig

===================================================================
--- src/mainboard/technexion/tim8690/Kconfig	(Revision 6027)

+++ src/mainboard/technexion/tim8690/Kconfig	(Arbeitskopie)

@@ -21,6 +21,7 @@ 

 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/technexion/tim8690/romstage.c

===================================================================
--- src/mainboard/technexion/tim8690/romstage.c	(Revision 6027)

+++ src/mainboard/technexion/tim8690/romstage.c	(Arbeitskopie)

@@ -18,7 +18,6 @@ 

  */
 
 #define SET_FIDVID 1
-#define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
 #endif
Index: src/mainboard/technexion/tim5690/Kconfig

===================================================================
--- src/mainboard/technexion/tim5690/Kconfig	(Revision 6027)

+++ src/mainboard/technexion/tim5690/Kconfig	(Arbeitskopie)

@@ -22,6 +22,7 @@ 

 	select HAVE_MAINBOARD_RESOURCES
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/technexion/tim5690/romstage.c

===================================================================
--- src/mainboard/technexion/tim5690/romstage.c	(Revision 6027)

+++ src/mainboard/technexion/tim5690/romstage.c	(Arbeitskopie)

@@ -18,7 +18,6 @@ 

  */
 
 #define SET_FIDVID 1
-#define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
 #endif
Index: src/mainboard/ibm/e326/Kconfig

===================================================================
--- src/mainboard/ibm/e326/Kconfig	(Revision 6027)

+++ src/mainboard/ibm/e326/Kconfig	(Arbeitskopie)

@@ -16,6 +16,7 @@ 

 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select WAIT_BEFORE_CPUS_INIT
 	select BOARD_ROMSIZE_KB_512
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/ibm/e326/romstage.c

===================================================================
--- src/mainboard/ibm/e326/romstage.c	(Revision 6027)

+++ src/mainboard/ibm/e326/romstage.c	(Arbeitskopie)

@@ -64,7 +64,6 @@ 

 	return smbus_read_byte(device, address);
 }
 
-#define QRANK_DIMM_SUPPORT 1
 
 #include "northbridge/amd/amdk8/raminit.c"
 #include "resourcemap.c"
Index: src/mainboard/ibm/e325/Kconfig

===================================================================
--- src/mainboard/ibm/e325/Kconfig	(Revision 6027)

+++ src/mainboard/ibm/e325/Kconfig	(Arbeitskopie)

@@ -16,6 +16,7 @@ 

 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select WAIT_BEFORE_CPUS_INIT
 	select BOARD_ROMSIZE_KB_512
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/ibm/e325/romstage.c

===================================================================
--- src/mainboard/ibm/e325/romstage.c	(Revision 6027)

+++ src/mainboard/ibm/e325/romstage.c	(Arbeitskopie)

@@ -64,7 +64,6 @@ 

 	return smbus_read_byte(device, address);
 }
 
-#define QRANK_DIMM_SUPPORT 1
 
 #include "northbridge/amd/amdk8/raminit.c"
 #include "resourcemap.c"
Index: src/mainboard/nvidia/l1_2pvv/Kconfig

===================================================================
--- src/mainboard/nvidia/l1_2pvv/Kconfig	(Revision 6027)

+++ src/mainboard/nvidia/l1_2pvv/Kconfig	(Arbeitskopie)

@@ -22,6 +22,7 @@ 

 	select K8_REV_F_SUPPORT
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/nvidia/l1_2pvv/ap_romstage.c

===================================================================
--- src/mainboard/nvidia/l1_2pvv/ap_romstage.c	(Revision 6027)

+++ src/mainboard/nvidia/l1_2pvv/ap_romstage.c	(Arbeitskopie)

@@ -25,7 +25,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 #define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
 
Index: src/mainboard/nvidia/l1_2pvv/romstage.c

===================================================================
--- src/mainboard/nvidia/l1_2pvv/romstage.c	(Revision 6027)

+++ src/mainboard/nvidia/l1_2pvv/romstage.c	(Arbeitskopie)

@@ -21,7 +21,6 @@ 

 
 #define K8_ALLOCATE_IO_RANGE 1
 
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
 #define SET_NB_CFG_54 1
Index: src/mainboard/asus/m4a785-m/Kconfig

===================================================================
--- src/mainboard/asus/m4a785-m/Kconfig	(Revision 6027)

+++ src/mainboard/asus/m4a785-m/Kconfig	(Arbeitskopie)

@@ -27,6 +27,7 @@ 

 	select ENABLE_APIC_EXT_ID
 	select TINY_BOOTBLOCK
 	select GFXUMA
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/asus/m4a785-m/romstage.c

===================================================================
--- src/mainboard/asus/m4a785-m/romstage.c	(Revision 6027)

+++ src/mainboard/asus/m4a785-m/romstage.c	(Arbeitskopie)

@@ -24,7 +24,6 @@ 

 #define SET_NB_CFG_54 1
 
 //used by raminit
-#define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
 #define FAM10_SCAN_PCI_BUS 0
Index: src/mainboard/asus/a8v-e_se/Kconfig

===================================================================
--- src/mainboard/asus/a8v-e_se/Kconfig	(Revision 6027)

+++ src/mainboard/asus/a8v-e_se/Kconfig	(Arbeitskopie)

@@ -16,6 +16,7 @@ 

 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_512
 	select RAMINIT_SYSINFO
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/asus/a8v-e_se/romstage.c

===================================================================
--- src/mainboard/asus/a8v-e_se/romstage.c	(Revision 6027)

+++ src/mainboard/asus/a8v-e_se/romstage.c	(Arbeitskopie)

@@ -25,7 +25,6 @@ 

 unsigned int get_sbdn(unsigned bus);
 
 /* Used by raminit. */
-#define QRANK_DIMM_SUPPORT 1
 
 /* Used by init_cpus and fidvid */
 #define SET_FIDVID 1
Index: src/mainboard/asus/a8n_e/Kconfig

===================================================================
--- src/mainboard/asus/a8n_e/Kconfig	(Revision 6027)

+++ src/mainboard/asus/a8n_e/Kconfig	(Arbeitskopie)

@@ -17,6 +17,7 @@ 

 	select BOARD_ROMSIZE_KB_512
 	select CK804_USE_NIC
 	select CK804_USE_ACI
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/asus/a8n_e/romstage.c

===================================================================
--- src/mainboard/asus/a8n_e/romstage.c	(Revision 6027)

+++ src/mainboard/asus/a8n_e/romstage.c	(Arbeitskopie)

@@ -25,7 +25,6 @@ 

 #define SERIAL_DEV PNP_DEV(0x2e, IT8712F_SP1)
 
 /* Used by raminit. */
-#define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS == 1
 #define SET_NB_CFG_54 1
Index: src/mainboard/asus/m2v-mx_se/Kconfig

===================================================================
--- src/mainboard/asus/m2v-mx_se/Kconfig	(Revision 6027)

+++ src/mainboard/asus/m2v-mx_se/Kconfig	(Arbeitskopie)

@@ -36,6 +36,7 @@ 

 	select VGA
 	select TINY_BOOTBLOCK
 	select HAVE_MAINBOARD_RESOURCES
+	select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
 	string
Index: src/mainboard/asus/m2v-mx_se/romstage.c

===================================================================
--- src/mainboard/asus/m2v-mx_se/romstage.c	(Revision 6027)

+++ src/mainboard/asus/m2v-mx_se/romstage.c	(Arbeitskopie)

@@ -25,7 +25,6 @@ 

 unsigned int get_sbdn(unsigned bus);
 
 /* Used by raminit. */
-#define QRANK_DIMM_SUPPORT 1
 
 /* Used by init_cpus and fidvid */
 #define SET_FIDVID 1
Index: src/northbridge/amd/amdk8/Kconfig

===================================================================
--- src/northbridge/amd/amdk8/Kconfig	(Revision 6027)

+++ src/northbridge/amd/amdk8/Kconfig	(Arbeitskopie)

@@ -49,6 +49,10 @@ 

 	bool
 	default n
 
+config QRANK_DIMM_SUPPORT
+	bool
+	default n
+
 if K8_REV_F_SUPPORT
 
 config DIMM_DDR2
Index: src/northbridge/amd/amdk8/raminit.c

===================================================================
--- src/northbridge/amd/amdk8/raminit.c	(Revision 6027)

+++ src/northbridge/amd/amdk8/raminit.c	(Arbeitskopie)

@@ -18,10 +18,6 @@ 

 # error "CONFIG_RAMTOP must be a power of 2"
 #endif
 
-#ifndef QRANK_DIMM_SUPPORT
-#define QRANK_DIMM_SUPPORT 0
-#endif
-
 void setup_resource_map(const unsigned int *register_values, int max)
 {
 	int i;
@@ -595,7 +591,7 @@ 

 	unsigned long side2;
 	unsigned long rows;
 	unsigned long col;
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 	unsigned long rank;
 #endif
 };
@@ -609,7 +605,7 @@ 

 	sz.side2 = 0;
 	sz.rows = 0;
 	sz.col = 0;
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 	sz.rank = 0;
 #endif
 
@@ -653,7 +649,7 @@ 

 	if ((value != 2) && (value != 4 )) {
 		goto val_err;
 	}
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 	sz.rank = value;
 #endif
 
@@ -682,7 +678,7 @@ 

 	sz.side2 = 0;
 	sz.rows = 0;
 	sz.col = 0;
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 	sz.rank = 0;
 #endif
  out:
@@ -730,7 +726,7 @@ 

 	/* Set the appropriate DIMM base address register */
 	pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1)+0)<<2), base0);
 	pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1)+1)<<2), base1);
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 	if (sz.rank == 4) {
 		pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1)+4)<<2), base0);
 		pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1)+5)<<2), base1);
@@ -741,7 +737,7 @@ 

 	if (base0) {
 		dch = pci_read_config32(ctrl->f2, DRAM_CONFIG_HIGH);
 		dch |= DCH_MEMCLK_EN0 << index;
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 		if (sz.rank == 4) {
 			dch |= DCH_MEMCLK_EN0 << (index + 2);
 		}
@@ -763,7 +759,7 @@ 

 
 	map = pci_read_config32(ctrl->f2, DRAM_BANK_ADDR_MAP);
 	map &= ~(0xf << (index * 4));
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 	if (sz.rank == 4) {
 		map &= ~(0xf << ( (index + 2) * 4));
 	}
@@ -774,7 +770,7 @@ 

 	if (sz.side1 >= (25 +3)) {
 		if (is_cpu_pre_d0()) {
 			map |= (sz.side1 - (25 + 3)) << (index *4);
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 			if (sz.rank == 4) {
 	 			map |= (sz.side1 - (25 + 3)) << ( (index + 2) * 4);
 			}
@@ -782,7 +778,7 @@ 

 		}
 		else {
 			map |= cs_map_aa[(sz.rows - 12) * 5 + (sz.col - 8) ] << (index*4);
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 			if (sz.rank == 4) {
 				map |=  cs_map_aa[(sz.rows - 12) * 5 + (sz.col - 8) ] << ( (index + 2) * 4);
 			}
@@ -1526,7 +1522,7 @@ 

 	}
 #if 0
 //down speed for full load 4 rank support
-#if QRANK_DIMM_SUPPORT
+#if CONFIG_QRANK_DIMM_SUPPORT
 	if (dimm_mask == (3|(3<<DIMM_SOCKETS)) ) {
 		int ranks = 4;
 		for (i = 0; (i < 4) && (ctrl->channel0[i]); i++) {
@@ -1793,7 +1789,7 @@ 

 {
 	uint32_t dcl;
 	int value;
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 	int rank;
 #endif
 	int dimm;
@@ -1802,7 +1798,7 @@ 

 		return -1;
 	}
 
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 	rank = spd_read_byte(ctrl->channel0[i], 5);	/* number of physical banks */
 	if (rank < 0) {
 		return -1;
@@ -1810,7 +1806,7 @@ 

 #endif
 
 	dimm = 1<<(DCL_x4DIMM_SHIFT+i);
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 	if (rank==4) {
 		dimm |= 1<<(DCL_x4DIMM_SHIFT+i+2);
 	}
Index: src/northbridge/amd/amdk8/raminit_f.c

===================================================================
--- src/northbridge/amd/amdk8/raminit_f.c	(Revision 6027)

+++ src/northbridge/amd/amdk8/raminit_f.c	(Arbeitskopie)

@@ -32,10 +32,6 @@ 

 #include "option_table.h"
 #endif
 
-#ifndef QRANK_DIMM_SUPPORT
-#define QRANK_DIMM_SUPPORT 0
-#endif
-
 #if CONFIG_DEBUG_RAM_SETUP
 #define printk_raminit(fmt, arg...) printk(BIOS_DEBUG, fmt, arg)
 #else
@@ -870,7 +866,7 @@ 

 		/* Set the appropriate DIMM base address register */
 		pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1) + 0) << 2), base0);
 		pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1) + 1) << 2), base1);
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 		if (sz->rank == 4) {
 			pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1) + 4) << 2), base0);
 			pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1) + 5) << 2), base1);
@@ -898,7 +894,7 @@ 

 		} else {
 			dword = pci_read_config32(ctrl->f2, DRAM_TIMING_LOW); //Channel A
 			dword &= ~(ClkDis0 >> index);
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 			if (sz->rank == 4) {
 				dword &= ~(ClkDis0 >> (index+2));
 			}
@@ -908,7 +904,7 @@ 

 			if (meminfo->is_Width128) { // ChannelA+B
 				dword = pci_read_config32(ctrl->f2, DRAM_CTRL_MISC);
 				dword &= ~(ClkDis0 >> index);
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 				if (sz->rank == 4) {
 					dword &= ~(ClkDis0 >> (index+2));
 				}
@@ -961,7 +957,7 @@ 

 	}
 	map = pci_read_config32(ctrl->f2, DRAM_BANK_ADDR_MAP);
 	map &= ~(0xf << (index * 4));
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 	if (sz->rank == 4) {
 		map &= ~(0xf << ( (index + 2) * 4));
 	}
@@ -972,7 +968,7 @@ 

 		unsigned temp_map;
 		temp_map = cs_map_aaa[(sz->bank-2)*3*4 + (sz->rows - 13)*3 + (sz->col - 9) ];
 		map |= temp_map << (index*4);
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 		if (sz->rank == 4) {
 			map |=  temp_map << ( (index + 2) * 4);
 		}
@@ -1312,7 +1308,7 @@ 

 	} else {
 		pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1) + 0) << 2), 0);
 		pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1) + 1) << 2), 0);
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 		if (meminfo->sz[index].rank == 4) {
 			pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1) + 4) << 2), 0);
 			pci_write_config32(ctrl->f2, DRAM_CSBASE + (((index << 1) + 5) << 2), 0);
@@ -2194,7 +2190,7 @@ 

 static void set_4RankRDimm(const struct mem_controller *ctrl,
 			const struct mem_param *param, struct mem_info *meminfo)
 {
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 	int value;
 	int i;
 	long dimm_mask = meminfo->dimm_mask;
@@ -2234,7 +2230,7 @@ 

 	uint32_t mask_single_rank;
 	uint32_t mask_page_1k;
 	int value;
-#if QRANK_DIMM_SUPPORT == 1
+#if CONFIG_QRANK_DIMM_SUPPORT
 	int rank;
 #endif
 
@@ -2267,20 +2263,20 @@ 

 
 		value = spd_read_byte(spd_device, SPD_PRI_WIDTH);
 
-		#if QRANK_DIMM_SUPPORT == 1
+		#if CONFIG_QRANK_DIMM_SUPPORT
 			rank = meminfo->sz[i].rank;
 		#endif
 
 		if (value==4) {
 			mask_x4 |= (1<<i);
-			#if QRANK_DIMM_SUPPORT == 1
+			#if CONFIG_QRANK_DIMM_SUPPORT
 			if (rank==4) {
 				mask_x4 |= 1<<(i+2);
 			}
 			#endif
 		} else if (value==16) {
 			mask_x16 |= (1<<i);
-			#if QRANK_DIMM_SUPPORT == 1
+			#if CONFIG_QRANK_DIMM_SUPPORT
 			 if (rank==4) {
 				 mask_x16 |= 1<<(i+2);
 			 }