[coreboot] [commit] r6089 - in trunk/src: mainboard/dell/s1850 mainboard/intel/jarrell northbridge/intel/e7520 northbridge/intel/e7525 northbridge/intel/i3100

[repository service]

Author: oxygene
Date: Thu Nov 18 12:36:16 2010
New Revision: 6089
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6089

Log:
Move DIMM_MAP_LOGICAL to Kconfig.

Signed-off-by: Patrick Georgi <patrick at georgi-clan.de>
Acked-by: Patrick Georgi <patrick at georgi-clan.de>

Modified:
   trunk/src/mainboard/dell/s1850/Kconfig
   trunk/src/mainboard/dell/s1850/romstage.c
   trunk/src/mainboard/intel/jarrell/Kconfig
   trunk/src/mainboard/intel/jarrell/romstage.c
   trunk/src/northbridge/intel/e7520/Kconfig
   trunk/src/northbridge/intel/e7520/raminit.c
   trunk/src/northbridge/intel/e7525/Kconfig
   trunk/src/northbridge/intel/e7525/raminit.c
   trunk/src/northbridge/intel/i3100/Kconfig
   trunk/src/northbridge/intel/i3100/raminit.c

Modified: trunk/src/mainboard/dell/s1850/Kconfig
==============================================================================
--- trunk/src/mainboard/dell/s1850/Kconfig	Thu Nov 18 11:48:15 2010	(r6088)
+++ trunk/src/mainboard/dell/s1850/Kconfig	Thu Nov 18 12:36:16 2010	(r6089)
@@ -46,4 +46,8 @@
 	int
 	default 9
 
+config DIMM_MAP_LOGICAL
+	hex
+	default 0x2841
+
 endif # BOARD_DELL_S1850

Modified: trunk/src/mainboard/dell/s1850/romstage.c
==============================================================================
--- trunk/src/mainboard/dell/s1850/romstage.c	Thu Nov 18 11:48:15 2010	(r6088)
+++ trunk/src/mainboard/dell/s1850/romstage.c	Thu Nov 18 12:36:16 2010	(r6089)
@@ -37,9 +37,6 @@
 	return smbus_read_byte(device, address);
 }
 
-/* this is very highly mainboard dependent, related to wiring */
-/* from factory BIOS via lspci */
-#define DIMM_MAP_LOGICAL 0x2841
 #include "northbridge/intel/e7520/raminit.c"
 #include "lib/generic_sdram.c"
 

Modified: trunk/src/mainboard/intel/jarrell/Kconfig
==============================================================================
--- trunk/src/mainboard/intel/jarrell/Kconfig	Thu Nov 18 11:48:15 2010	(r6088)
+++ trunk/src/mainboard/intel/jarrell/Kconfig	Thu Nov 18 12:36:16 2010	(r6089)
@@ -43,4 +43,8 @@
 	hex
 	default 0x1079
 
+config DIMM_MAP_LOGICAL
+	hex
+	default 0x0124
+
 endif # BOARD_INTEL_JARRELL

Modified: trunk/src/mainboard/intel/jarrell/romstage.c
==============================================================================
--- trunk/src/mainboard/intel/jarrell/romstage.c	Thu Nov 18 11:48:15 2010	(r6088)
+++ trunk/src/mainboard/intel/jarrell/romstage.c	Thu Nov 18 12:36:16 2010	(r6089)
@@ -29,8 +29,6 @@
 #define DEVPRES_CONFIG  (DEVPRES_D1F0 | DEVPRES_D2F0 | DEVPRES_D6F0)
 #define DEVPRES1_CONFIG (DEVPRES1_D0F1 | DEVPRES1_D8F0)
 
-#define DIMM_MAP_LOGICAL 0x0124
-
 static inline int spd_read_byte(unsigned device, unsigned address)
 {
 	return smbus_read_byte(device, address);

Modified: trunk/src/northbridge/intel/e7520/Kconfig
==============================================================================
--- trunk/src/northbridge/intel/e7520/Kconfig	Thu Nov 18 11:48:15 2010	(r6088)
+++ trunk/src/northbridge/intel/e7520/Kconfig	Thu Nov 18 12:36:16 2010	(r6089)
@@ -1,3 +1,9 @@
 config NORTHBRIDGE_INTEL_E7520
 	bool
 
+if NORTHBRIDGE_INTEL_E7520
+config DIMM_MAP_LOGICAL
+	hex
+	default 0x1248
+
+endif

Modified: trunk/src/northbridge/intel/e7520/raminit.c
==============================================================================
--- trunk/src/northbridge/intel/e7520/raminit.c	Thu Nov 18 11:48:15 2010	(r6088)
+++ trunk/src/northbridge/intel/e7520/raminit.c	Thu Nov 18 12:36:16 2010	(r6089)
@@ -1078,12 +1078,8 @@
 	print_debug("Starting SDRAM Enable\n");
 
 	/* 0x80 */
-#ifdef DIMM_MAP_LOGICAL
 	pci_write_config32(PCI_DEV(0, 0x00, 0), DRM,
-		0x00210000 | DIMM_MAP_LOGICAL);
-#else
-	pci_write_config32(PCI_DEV(0, 0x00, 0), DRM, 0x00211248);
-#endif
+		0x00210000 | CONFIG_DIMM_MAP_LOGICAL);
 	/* set dram type and Front Side Bus freq. */
 	drc = spd_set_dram_controller_mode(ctrl, mask);
 	if( drc == 0) {

Modified: trunk/src/northbridge/intel/e7525/Kconfig
==============================================================================
--- trunk/src/northbridge/intel/e7525/Kconfig	Thu Nov 18 11:48:15 2010	(r6088)
+++ trunk/src/northbridge/intel/e7525/Kconfig	Thu Nov 18 12:36:16 2010	(r6089)
@@ -1,3 +1,9 @@
 config NORTHBRIDGE_INTEL_E7525
 	bool
 
+if NORTHBRIDGE_INTEL_E7525
+config DIMM_MAP_LOGICAL
+	hex
+	default 0x1248
+
+endif

Modified: trunk/src/northbridge/intel/e7525/raminit.c
==============================================================================
--- trunk/src/northbridge/intel/e7525/raminit.c	Thu Nov 18 11:48:15 2010	(r6088)
+++ trunk/src/northbridge/intel/e7525/raminit.c	Thu Nov 18 12:36:16 2010	(r6089)
@@ -1055,12 +1055,8 @@
 	print_debug("Starting SDRAM Enable\n");
 
 	/* 0x80 */
-#ifdef DIMM_MAP_LOGICAL
 	pci_write_config32(ctrl->f0, DRM,
-		0x00210000 | DIMM_MAP_LOGICAL);
-#else
-	pci_write_config32(ctrl->f0, DRM, 0x00211248);
-#endif
+		0x00210000 | CONFIG_DIMM_MAP_LOGICAL);
 	/* set dram type and Front Side Bus freq. */
 	drc = spd_set_dram_controller_mode(ctrl, mask);
 	if( drc == 0) {

Modified: trunk/src/northbridge/intel/i3100/Kconfig
==============================================================================
--- trunk/src/northbridge/intel/i3100/Kconfig	Thu Nov 18 11:48:15 2010	(r6088)
+++ trunk/src/northbridge/intel/i3100/Kconfig	Thu Nov 18 12:36:16 2010	(r6089)
@@ -1,3 +1,9 @@
 config NORTHBRIDGE_INTEL_I3100
 	bool
 
+if NORTHBRIDGE_INTEL_I3100
+config DIMM_MAP_LOGICAL
+	hex
+	default 0x1248
+
+endif

Modified: trunk/src/northbridge/intel/i3100/raminit.c
==============================================================================
--- trunk/src/northbridge/intel/i3100/raminit.c	Thu Nov 18 11:48:15 2010	(r6088)
+++ trunk/src/northbridge/intel/i3100/raminit.c	Thu Nov 18 12:36:16 2010	(r6089)
@@ -973,12 +973,8 @@
 	print_debug("Starting SDRAM Enable\n");
 
 	/* 0x80 */
-#ifdef DIMM_MAP_LOGICAL
 	pci_write_config32(ctrl->f0, DRM,
-		0x00410000 | DIMM_MAP_LOGICAL);
-#else
-	pci_write_config32(ctrl->f0, DRM, 0x00411248);
-#endif
+		0x00410000 | CONFIG_DIMM_MAP_LOGICAL);
 	/* set dram type and Front Side Bus freq. */
 	drc = spd_set_dram_controller_mode(ctrl, mask);
 	if( drc == 0) {