4 files changed, 16 insertions, 10 deletions
diff --git a/src/mainboard/intel/kunimitsu/romstage.c b/src/mainboard/intel/kunimitsu/romstage.c
index f900ca319b..0312ad1987 100644
--- a/src/mainboard/intel/kunimitsu/romstage.c
+++ b/src/mainboard/intel/kunimitsu/romstage.c
@@ -24,8 +24,10 @@ void mainboard_memory_init_params(struct romstage_params *params,
 				  MEMORY_INIT_UPD *memory_params)
 {
 	spd_memory_init_params(memory_params);
-	mainboard_fill_dq_map_data(&memory_params->DqByteMapCh0);
-	mainboard_fill_dqs_map_data(&memory_params->DqsMapCpu2DramCh0);
+	mainboard_fill_dq_map_data(&memory_params->DqByteMapCh0,
+				   &memory_params->DqByteMapCh1);
+	mainboard_fill_dqs_map_data(&memory_params->DqsMapCpu2DramCh0,
+				    &memory_params->DqsMapCpu2DramCh1);
 	mainboard_fill_rcomp_res_data(&memory_params->RcompResistor);
 	mainboard_fill_rcomp_strength_data(&memory_params->RcompTarget);
 	memory_params->MemorySpdDataLen = SPD_LEN;
diff --git a/src/mainboard/intel/kunimitsu/romstage_fsp20.c b/src/mainboard/intel/kunimitsu/romstage_fsp20.c
index 536469339d..2a4474e15f 100644
--- a/src/mainboard/intel/kunimitsu/romstage_fsp20.c
+++ b/src/mainboard/intel/kunimitsu/romstage_fsp20.c
@@ -25,8 +25,10 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 	FSP_M_CONFIG *mem_cfg;
 	mem_cfg = &mupd->FspmConfig;
 
-	mainboard_fill_dq_map_data(&mem_cfg->DqByteMapCh0);
-	mainboard_fill_dqs_map_data(&mem_cfg->DqsMapCpu2DramCh0);
+	mainboard_fill_dq_map_data(&mem_cfg->DqByteMapCh0,
+				   &mem_cfg->DqByteMapCh1);
+	mainboard_fill_dqs_map_data(&mem_cfg->DqsMapCpu2DramCh0,
+				    &mem_cfg->DqsMapCpu2DramCh1);
 	mainboard_fill_rcomp_res_data(&mem_cfg->RcompResistor);
 	mainboard_fill_rcomp_strength_data(&mem_cfg->RcompTarget);
 
diff --git a/src/mainboard/intel/kunimitsu/spd/spd.h b/src/mainboard/intel/kunimitsu/spd/spd.h
index 22d371f4bc..8bc7336470 100644
--- a/src/mainboard/intel/kunimitsu/spd/spd.h
+++ b/src/mainboard/intel/kunimitsu/spd/spd.h
@@ -55,8 +55,8 @@ static inline int get_spd_index(void) {
 	return (gpio_base2_value(spd_gpios, ARRAY_SIZE(spd_gpios)));
 }
 void spd_memory_init_params(MEMORY_INIT_UPD *memory_params);
-void mainboard_fill_dq_map_data(void *dq_map_ptr);
-void mainboard_fill_dqs_map_data(void *dqs_map_ptr);
+void mainboard_fill_dq_map_data(void *dq_map_ch0, void *dq_map_ch1);
+void mainboard_fill_dqs_map_data(void *dqs_map_ch0, void *dqs_map_ch1);
 void mainboard_fill_rcomp_res_data(void *rcomp_ptr);
 void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr);
 uintptr_t mainboard_get_spd_data(void);
diff --git a/src/mainboard/intel/kunimitsu/spd/spd_util.c b/src/mainboard/intel/kunimitsu/spd/spd_util.c
index 288ee1e7ee..05a0a86734 100644
--- a/src/mainboard/intel/kunimitsu/spd/spd_util.c
+++ b/src/mainboard/intel/kunimitsu/spd/spd_util.c
@@ -19,7 +19,7 @@
 #include "boardid.h"
 #include "spd.h"
 
-void mainboard_fill_dq_map_data(void *dq_map_ptr)
+void mainboard_fill_dq_map_data(void *dq_map_ch0, void *dq_map_ch1)
 {
 	/* DQ byte map */
 	const u8 dq_map[2][12] = {
@@ -27,16 +27,18 @@ void mainboard_fill_dq_map_data(void *dq_map_ptr)
 		    0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 },
 		  { 0x0F, 0xF0, 0x00, 0xF0, 0x0F, 0xF0,
 		    0x0F, 0x00, 0xFF, 0x00, 0xFF, 0x00 } };
-	memcpy(dq_map_ptr, dq_map, sizeof(dq_map));
+	memcpy(dq_map_ch0, dq_map[0], sizeof(dq_map[0]));
+	memcpy(dq_map_ch1, dq_map[1], sizeof(dq_map[1]));
 }
 
-void mainboard_fill_dqs_map_data(void *dqs_map_ptr)
+void mainboard_fill_dqs_map_data(void *dqs_map_ch0, void *dqs_map_ch1)
 {
 	/* DQS CPU<>DRAM map */
 	const u8 dqs_map[2][8] = {
 		{ 0, 1, 3, 2, 6, 5, 4, 7 },
 		{ 2, 3, 0, 1, 6, 7, 4, 5 } };
-	memcpy(dqs_map_ptr, dqs_map, sizeof(dqs_map));
+	memcpy(dqs_map_ch0, dqs_map[0], sizeof(dqs_map[0]));
+	memcpy(dqs_map_ch1, dqs_map[1], sizeof(dqs_map[1]));
 }
 
 void mainboard_fill_rcomp_res_data(void *rcomp_ptr)