summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2017-10-07 17:01:04 -0500
committerMartin Roth <martinroth@google.com>2017-10-13 14:30:21 +0000
commita34cf524692737b83bfdf7e482ddf15ab9108c0d (patch)
treecb3347fdd767733449fbb486d3aa9142cb1f5678
parent8a02727f508826ef8f1e8bbe7581eedc2e0c1198 (diff)
downloadcoreboot-a34cf524692737b83bfdf7e482ddf15ab9108c0d.tar.xz
google/cyan variants: fix single/dual channel reporting
Fix typos in determining single/dual channel in cyan variants which resulted in all boards being reported as 4GB/dual channel in the cbmem console log. These typos were found and fixed in yet-to-be-merged variants; this patch applies the same fixes to already-merged boards. Change-Id: I615463668e77bd817d5270f0f04d4d01f74e3b47 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/21917 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin Roth <martinroth@google.com>
-rw-r--r--src/mainboard/google/cyan/variants/banon/spd_util.c4
-rw-r--r--src/mainboard/google/cyan/variants/celes/spd_util.c4
-rw-r--r--src/mainboard/google/cyan/variants/cyan/spd_util.c2
-rw-r--r--src/mainboard/google/cyan/variants/edgar/spd_util.c2
-rw-r--r--src/mainboard/google/cyan/variants/reks/spd_util.c4
-rw-r--r--src/mainboard/google/cyan/variants/terra/spd_util.c4
6 files changed, 10 insertions, 10 deletions
diff --git a/src/mainboard/google/cyan/variants/banon/spd_util.c b/src/mainboard/google/cyan/variants/banon/spd_util.c
index 7b0433d5b7..2c9181e486 100644
--- a/src/mainboard/google/cyan/variants/banon/spd_util.c
+++ b/src/mainboard/google/cyan/variants/banon/spd_util.c
@@ -36,10 +36,10 @@ int get_variant_spd_index(int ram_id, int *dual)
/* Determine if single or dual channel memory system */
/* RAMID3 is deterministic for banon */
- *dual = ((ram_id > 3) & 0x1) ? 0 : 1;
+ *dual = ((ram_id >> 3) & 0x1) ? 0 : 1;
/* Display the RAM type */
- printk(BIOS_DEBUG, dual ? "4GiB " : "2GiB ");
+ printk(BIOS_DEBUG, *dual ? "4GiB " : "2GiB ");
switch (spd_index) {
case 0:
printk(BIOS_DEBUG, "Samsung K4E8E304EE-EGCE\n");
diff --git a/src/mainboard/google/cyan/variants/celes/spd_util.c b/src/mainboard/google/cyan/variants/celes/spd_util.c
index d6253368e9..baf67053f6 100644
--- a/src/mainboard/google/cyan/variants/celes/spd_util.c
+++ b/src/mainboard/google/cyan/variants/celes/spd_util.c
@@ -49,10 +49,10 @@ int get_variant_spd_index(int ram_id, int *dual)
/* Determine if single or dual channel memory system */
/* RAMID3 is deterministic for celes */
- *dual = ((ram_id > 3) & 0x1) ? 0 : 1;
+ *dual = ((ram_id >> 3) & 0x1) ? 0 : 1;
/* Display the RAM type */
- printk(BIOS_DEBUG, dual ? "4GiB " : "2GiB ");
+ printk(BIOS_DEBUG, *dual ? "4GiB " : "2GiB ");
switch (spd_index) {
case 0:
printk(BIOS_DEBUG, "Samsung K4E8E304EE-EGCE\n");
diff --git a/src/mainboard/google/cyan/variants/cyan/spd_util.c b/src/mainboard/google/cyan/variants/cyan/spd_util.c
index 63a1df3760..75d7509b73 100644
--- a/src/mainboard/google/cyan/variants/cyan/spd_util.c
+++ b/src/mainboard/google/cyan/variants/cyan/spd_util.c
@@ -33,7 +33,7 @@ int get_variant_spd_index(int ram_id, int *dual)
{
/* Determine if single or dual channel memory system */
/* RAMID1 is deterministic for cyan */
- *dual = ((ram_id > 1) & 0x1) ? 0 : 1;
+ *dual = ((ram_id >> 1) & 0x1) ? 0 : 1;
/* Display the RAM type */
switch (ram_id) {
diff --git a/src/mainboard/google/cyan/variants/edgar/spd_util.c b/src/mainboard/google/cyan/variants/edgar/spd_util.c
index 61aa9a7108..9651c27d17 100644
--- a/src/mainboard/google/cyan/variants/edgar/spd_util.c
+++ b/src/mainboard/google/cyan/variants/edgar/spd_util.c
@@ -32,7 +32,7 @@ int get_variant_spd_index(int ram_id, int *dual)
{
/* Determine if single or dual channel memory system */
/* RAMID1 is deterministic for edgar */
- *dual = ((ram_id > 1) & 0x1) ? 0 : 1;
+ *dual = ((ram_id >> 1) & 0x1) ? 0 : 1;
/* Display the RAM type */
switch (ram_id) {
diff --git a/src/mainboard/google/cyan/variants/reks/spd_util.c b/src/mainboard/google/cyan/variants/reks/spd_util.c
index 303857f50d..d2a130f664 100644
--- a/src/mainboard/google/cyan/variants/reks/spd_util.c
+++ b/src/mainboard/google/cyan/variants/reks/spd_util.c
@@ -40,10 +40,10 @@ int get_variant_spd_index(int ram_id, int *dual)
/* Determine if single or dual channel memory system */
/* RAMID3 is deterministic for reks */
- *dual = ((ram_id > 3) & 0x1) ? 1 : 0;
+ *dual = ((ram_id >> 3) & 0x1) ? 1 : 0;
/* Display the RAM type */
- printk(BIOS_DEBUG, dual ? "4GiB " : "2GiB ");
+ printk(BIOS_DEBUG, *dual ? "4GiB " : "2GiB ");
switch (spd_index) {
case 0:
printk(BIOS_DEBUG, "Samsung K4E8E304EE-EGCF\n");
diff --git a/src/mainboard/google/cyan/variants/terra/spd_util.c b/src/mainboard/google/cyan/variants/terra/spd_util.c
index 7b4629d05a..72d17d5085 100644
--- a/src/mainboard/google/cyan/variants/terra/spd_util.c
+++ b/src/mainboard/google/cyan/variants/terra/spd_util.c
@@ -37,10 +37,10 @@ int get_variant_spd_index(int ram_id, int *dual)
/* Determine if single or dual channel memory system */
/* RAMID3 is deterministic for terra */
- *dual = ((ram_id > 3) & 0x1) ? 1 : 0;
+ *dual = ((ram_id >> 3) & 0x1) ? 1 : 0;
/* Display the RAM type */
- printk(BIOS_DEBUG, dual ? "4GiB " : "2GiB ");
+ printk(BIOS_DEBUG, *dual ? "4GiB " : "2GiB ");
switch (spd_index) {
case 0:
printk(BIOS_DEBUG, "Samsung K4E8E304EE-EGCE 1600MHz\n");