summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/eve/romstage.c6
-rw-r--r--src/mainboard/google/glados/variants/asuka/variant.c12
-rw-r--r--src/mainboard/google/glados/variants/caroline/variant.c12
-rw-r--r--src/mainboard/google/glados/variants/cave/variant.c12
-rw-r--r--src/mainboard/google/glados/variants/chell/variant.c12
-rw-r--r--src/mainboard/google/glados/variants/glados/variant.c12
-rw-r--r--src/mainboard/google/glados/variants/lars/variant.c12
-rw-r--r--src/mainboard/google/glados/variants/sentry/variant.c12
8 files changed, 60 insertions, 30 deletions
diff --git a/src/mainboard/google/eve/romstage.c b/src/mainboard/google/eve/romstage.c
index 975eea5819..7114715fbc 100644
--- a/src/mainboard/google/eve/romstage.c
+++ b/src/mainboard/google/eve/romstage.c
@@ -40,8 +40,10 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
/* Rcomp target */
const u16 rcomp_target[] = { 100, 40, 40, 23, 40 };
- memcpy(&mem_cfg->DqByteMapCh0, dq_map, sizeof(dq_map));
- memcpy(&mem_cfg->DqsMapCpu2DramCh0, dqs_map, sizeof(dqs_map));
+ memcpy(&mem_cfg->DqByteMapCh0, dq_map[0], sizeof(dq_map[0]));
+ memcpy(&mem_cfg->DqByteMapCh1, dq_map[1], sizeof(dq_map[1]));
+ memcpy(&mem_cfg->DqsMapCpu2DramCh0, dqs_map[0], sizeof(dqs_map[0]));
+ memcpy(&mem_cfg->DqsMapCpu2DramCh1, dqs_map[1], sizeof(dqs_map[1]));
memcpy(&mem_cfg->RcompResistor, rcomp_resistor, sizeof(rcomp_resistor));
memcpy(&mem_cfg->RcompTarget, rcomp_target, sizeof(rcomp_target));
diff --git a/src/mainboard/google/glados/variants/asuka/variant.c b/src/mainboard/google/glados/variants/asuka/variant.c
index 4c778970fe..fdef81c5cd 100644
--- a/src/mainboard/google/glados/variants/asuka/variant.c
+++ b/src/mainboard/google/glados/variants/asuka/variant.c
@@ -39,10 +39,14 @@ void variant_memory_init_params(
/* Rcomp target */
const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
- memcpy(memory_params->DqByteMapCh0, dq_map,
- sizeof(memory_params->DqByteMapCh0) * 2);
- memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map,
- sizeof(memory_params->DqsMapCpu2DramCh0) * 2);
+ memcpy(memory_params->DqByteMapCh0, dq_map[0],
+ sizeof(memory_params->DqByteMapCh0));
+ memcpy(memory_params->DqByteMapCh1, dq_map[1],
+ sizeof(memory_params->DqByteMapCh1));
+ memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map[0],
+ sizeof(memory_params->DqsMapCpu2DramCh0));
+ memcpy(memory_params->DqsMapCpu2DramCh1, dqs_map[1],
+ sizeof(memory_params->DqsMapCpu2DramCh1));
memcpy(memory_params->RcompResistor, RcompResistor,
sizeof(memory_params->RcompResistor));
memcpy(memory_params->RcompTarget, RcompTarget,
diff --git a/src/mainboard/google/glados/variants/caroline/variant.c b/src/mainboard/google/glados/variants/caroline/variant.c
index d61a538d56..ab6bd2c1bd 100644
--- a/src/mainboard/google/glados/variants/caroline/variant.c
+++ b/src/mainboard/google/glados/variants/caroline/variant.c
@@ -41,10 +41,14 @@ void variant_memory_init_params(
/* Rcomp target */
const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
- memcpy(memory_params->DqByteMapCh0, dq_map,
- sizeof(memory_params->DqByteMapCh0) * 2);
- memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map,
- sizeof(memory_params->DqsMapCpu2DramCh0) * 2);
+ memcpy(memory_params->DqByteMapCh0, dq_map[0],
+ sizeof(memory_params->DqByteMapCh0));
+ memcpy(memory_params->DqByteMapCh1, dq_map[1],
+ sizeof(memory_params->DqByteMapCh1));
+ memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map[0],
+ sizeof(memory_params->DqsMapCpu2DramCh0));
+ memcpy(memory_params->DqsMapCpu2DramCh1, dqs_map[1],
+ sizeof(memory_params->DqsMapCpu2DramCh1));
memcpy(memory_params->RcompResistor, RcompResistor,
sizeof(memory_params->RcompResistor));
memcpy(memory_params->RcompTarget, RcompTarget,
diff --git a/src/mainboard/google/glados/variants/cave/variant.c b/src/mainboard/google/glados/variants/cave/variant.c
index fc27fb4b61..d63a298df7 100644
--- a/src/mainboard/google/glados/variants/cave/variant.c
+++ b/src/mainboard/google/glados/variants/cave/variant.c
@@ -41,10 +41,14 @@ void variant_memory_init_params(
/* Rcomp target */
const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
- memcpy(memory_params->DqByteMapCh0, dq_map,
- sizeof(memory_params->DqByteMapCh0) * 2);
- memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map,
- sizeof(memory_params->DqsMapCpu2DramCh0) * 2);
+ memcpy(memory_params->DqByteMapCh0, dq_map[0],
+ sizeof(memory_params->DqByteMapCh0));
+ memcpy(memory_params->DqByteMapCh1, dq_map[1],
+ sizeof(memory_params->DqByteMapCh1));
+ memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map[0],
+ sizeof(memory_params->DqsMapCpu2DramCh0));
+ memcpy(memory_params->DqsMapCpu2DramCh1, dqs_map[1],
+ sizeof(memory_params->DqsMapCpu2DramCh1));
memcpy(memory_params->RcompResistor, RcompResistor,
sizeof(memory_params->RcompResistor));
memcpy(memory_params->RcompTarget, RcompTarget,
diff --git a/src/mainboard/google/glados/variants/chell/variant.c b/src/mainboard/google/glados/variants/chell/variant.c
index 2d1b363cab..3e8503fe9e 100644
--- a/src/mainboard/google/glados/variants/chell/variant.c
+++ b/src/mainboard/google/glados/variants/chell/variant.c
@@ -41,10 +41,14 @@ void variant_memory_init_params(
/* Rcomp target */
const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
- memcpy(memory_params->DqByteMapCh0, dq_map,
- sizeof(memory_params->DqByteMapCh0) * 2);
- memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map,
- sizeof(memory_params->DqsMapCpu2DramCh0) * 2);
+ memcpy(memory_params->DqByteMapCh0, dq_map[0],
+ sizeof(memory_params->DqByteMapCh0));
+ memcpy(memory_params->DqByteMapCh1, dq_map[1],
+ sizeof(memory_params->DqByteMapCh1));
+ memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map[0],
+ sizeof(memory_params->DqsMapCpu2DramCh0));
+ memcpy(memory_params->DqsMapCpu2DramCh1, dqs_map[1],
+ sizeof(memory_params->DqsMapCpu2DramCh1));
memcpy(memory_params->RcompResistor, RcompResistor,
sizeof(memory_params->RcompResistor));
memcpy(memory_params->RcompTarget, RcompTarget,
diff --git a/src/mainboard/google/glados/variants/glados/variant.c b/src/mainboard/google/glados/variants/glados/variant.c
index fc27fb4b61..d63a298df7 100644
--- a/src/mainboard/google/glados/variants/glados/variant.c
+++ b/src/mainboard/google/glados/variants/glados/variant.c
@@ -41,10 +41,14 @@ void variant_memory_init_params(
/* Rcomp target */
const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
- memcpy(memory_params->DqByteMapCh0, dq_map,
- sizeof(memory_params->DqByteMapCh0) * 2);
- memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map,
- sizeof(memory_params->DqsMapCpu2DramCh0) * 2);
+ memcpy(memory_params->DqByteMapCh0, dq_map[0],
+ sizeof(memory_params->DqByteMapCh0));
+ memcpy(memory_params->DqByteMapCh1, dq_map[1],
+ sizeof(memory_params->DqByteMapCh1));
+ memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map[0],
+ sizeof(memory_params->DqsMapCpu2DramCh0));
+ memcpy(memory_params->DqsMapCpu2DramCh1, dqs_map[1],
+ sizeof(memory_params->DqsMapCpu2DramCh1));
memcpy(memory_params->RcompResistor, RcompResistor,
sizeof(memory_params->RcompResistor));
memcpy(memory_params->RcompTarget, RcompTarget,
diff --git a/src/mainboard/google/glados/variants/lars/variant.c b/src/mainboard/google/glados/variants/lars/variant.c
index cff0096291..37860c3738 100644
--- a/src/mainboard/google/glados/variants/lars/variant.c
+++ b/src/mainboard/google/glados/variants/lars/variant.c
@@ -58,10 +58,14 @@ void variant_memory_init_params(
if (spd_index == K4E6E304EB_MEM_ID)
targeted_rcomp = StrengthendRcompTarget;
- memcpy(params->DqByteMapCh0, dq_map,
- sizeof(params->DqByteMapCh0) * 2);
- memcpy(params->DqsMapCpu2DramCh0, dqs_map,
- sizeof(params->DqsMapCpu2DramCh0) * 2);
+ memcpy(params->DqByteMapCh0, dq_map[0],
+ sizeof(params->DqByteMapCh0));
+ memcpy(params->DqByteMapCh1, dq_map[1],
+ sizeof(params->DqByteMapCh1));
+ memcpy(params->DqsMapCpu2DramCh0, dqs_map[0],
+ sizeof(params->DqsMapCpu2DramCh0));
+ memcpy(params->DqsMapCpu2DramCh1, dqs_map[1],
+ sizeof(params->DqsMapCpu2DramCh1));
memcpy(params->RcompResistor, RcompResistor,
sizeof(params->RcompResistor));
memcpy(params->RcompTarget, targeted_rcomp,
diff --git a/src/mainboard/google/glados/variants/sentry/variant.c b/src/mainboard/google/glados/variants/sentry/variant.c
index 4c7fa23f08..101be2a0fb 100644
--- a/src/mainboard/google/glados/variants/sentry/variant.c
+++ b/src/mainboard/google/glados/variants/sentry/variant.c
@@ -51,10 +51,14 @@ void variant_memory_init_params(
if (spd_index == K4E6E304EE_MEM_ID)
targeted_rcomp = StrengthendRcompTarget;
- memcpy(memory_params->DqByteMapCh0, dq_map,
- sizeof(memory_params->DqByteMapCh0) * 2);
- memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map,
- sizeof(memory_params->DqsMapCpu2DramCh0) * 2);
+ memcpy(memory_params->DqByteMapCh0, dq_map[0],
+ sizeof(memory_params->DqByteMapCh0));
+ memcpy(memory_params->DqByteMapCh1, dq_map[1],
+ sizeof(memory_params->DqByteMapCh1));
+ memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map[0],
+ sizeof(memory_params->DqsMapCpu2DramCh0));
+ memcpy(memory_params->DqsMapCpu2DramCh1, dqs_map[1],
+ sizeof(memory_params->DqsMapCpu2DramCh1));
memcpy(memory_params->RcompResistor, RcompResistor,
sizeof(memory_params->RcompResistor));
memcpy(memory_params->RcompTarget, targeted_rcomp,