[coreboot-gerrit] Change in coreboot[master]: nb/intel/pineview/raminit: Fix CONFIG_DEBUG_RAM_SETUP=y not ...

[Arthur Heymans (Code Review)]

Arthur Heymans has submitted this change and it was merged. ( https://review.coreboot.org/19336 )

Change subject: nb/intel/pineview/raminit: Fix CONFIG_DEBUG_RAM_SETUP=y not compiling
......................................................................


nb/intel/pineview/raminit: Fix CONFIG_DEBUG_RAM_SETUP=y not compiling

The function decode_spd uses undeclared variables and an incorrectly
initialized array.

Change-Id: Ib45a8b2946c04c270e29524675b1f09d491d282b
Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
Reviewed-on: https://review.coreboot.org/19336
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter at users.sourceforge.net>
Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude at gmail.com>
Reviewed-by: Martin Roth <martinroth at google.com>
---
M src/northbridge/intel/pineview/raminit.c
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Philippe Mathieu-Daudé: Looks good to me, but someone else must approve
  Paul Menzel: Looks good to me, but someone else must approve
  build bot (Jenkins): Verified
  Martin Roth: Looks good to me, approved



diff --git a/src/northbridge/intel/pineview/raminit.c b/src/northbridge/intel/pineview/raminit.c
index e1d23a5..a45b4da 100644
--- a/src/northbridge/intel/pineview/raminit.c
+++ b/src/northbridge/intel/pineview/raminit.c
@@ -109,7 +109,7 @@
 	return smbus_read_byte(device, address);
 }
 
-static int decode_spd(struct dimminfo *d)
+static int decode_spd(struct dimminfo *d, int i)
 {
 	d->type = 0;
 	if (d->spd_data[20] == 0x2) {
@@ -136,7 +136,7 @@
 	d->tWR = d->spd_data[36];
 	d->ranks = d->sides; // XXX
 #if CONFIG_DEBUG_RAM_SETUP
-	const char *ubso[] = { {"UB"}, {"SO"} };
+	const char *ubso[2] = { "UB", "SO" };
 #endif
 	PRINTK_DEBUG("%s-DIMM %d\n", &ubso[d->type][0], i);
 	PRINTK_DEBUG("  Sides     : %d\n", d->sides);
@@ -305,7 +305,7 @@
 
 	int err = 1;
 	FOR_EACH_POPULATED_DIMM(s->dimms, i) {
-		err = decode_spd(&s->dimms[i]);
+		err = decode_spd(&s->dimms[i], i);
 		s->dt0mode |= (s->dimms[i].spd_data[49] & 0x2) >> 1;
 	}
 	if (err) {

-- 
To view, visit https://review.coreboot.org/19336
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib45a8b2946c04c270e29524675b1f09d491d282b
Gerrit-PatchSet: 3
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Arthur Heymans <arthur at aheymans.xyz>
Gerrit-Reviewer: Arthur Heymans <arthur at aheymans.xyz>
Gerrit-Reviewer: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: Paul Menzel <paulepanter at users.sourceforge.net>
Gerrit-Reviewer: Philippe Mathieu-Daudé <philippe.mathieu.daude at gmail.com>
Gerrit-Reviewer: build bot (Jenkins)