From 116a837818897d5f1f0c76021d48532133e8f5f6 Mon Sep 17 00:00:00 2001 From: Wim Vervoorn Date: Wed, 11 Dec 2019 11:54:33 +0100 Subject: mb: Use fixed value in RcompTarget structure Now RCOMP_TARGET_PARAMS is defined and used once in the definition of the RcompTarget structure. All other structures in these functions use a fixed value. Replace RCOMP_TARGET_PARAMS with fixed value. BUG=N/A TEST=build Change-Id: Ibe7c72c65975354433e9a0c613bda715eb782412 Signed-off-by: Wim Vervoorn Reviewed-on: https://review.coreboot.org/c/coreboot/+/37658 Reviewed-by: Frans Hendriks Tested-by: build bot (Jenkins) --- src/mainboard/intel/cannonlake_rvp/spd/spd.h | 2 -- src/mainboard/intel/cannonlake_rvp/spd/spd_util.c | 3 +-- src/mainboard/intel/icelake_rvp/spd/spd.h | 2 -- src/mainboard/intel/icelake_rvp/spd/spd_util.c | 6 +++--- src/mainboard/intel/kblrvp/spd/spd.h | 2 -- src/mainboard/intel/kblrvp/spd/spd_util.c | 3 +-- src/mainboard/intel/kunimitsu/spd/spd.h | 1 - src/mainboard/intel/kunimitsu/spd/spd_util.c | 4 ++-- src/mainboard/intel/saddlebrook/spd/spd.h | 2 -- src/mainboard/intel/saddlebrook/spd/spd_util.c | 3 +-- 10 files changed, 8 insertions(+), 20 deletions(-) (limited to 'src/mainboard/intel') diff --git a/src/mainboard/intel/cannonlake_rvp/spd/spd.h b/src/mainboard/intel/cannonlake_rvp/spd/spd.h index 128eb64a3c..4193e9cb2f 100644 --- a/src/mainboard/intel/cannonlake_rvp/spd/spd.h +++ b/src/mainboard/intel/cannonlake_rvp/spd/spd.h @@ -17,8 +17,6 @@ #ifndef MAINBOARD_SPD_H #define MAINBOARD_SPD_H -#define RCOMP_TARGET_PARAMS 0x5 - void mainboard_fill_dq_map_ch0(void *dq_map_ptr); void mainboard_fill_dq_map_ch1(void *dq_map_ptr); void mainboard_fill_dqs_map_ch0(void *dqs_map_ptr); diff --git a/src/mainboard/intel/cannonlake_rvp/spd/spd_util.c b/src/mainboard/intel/cannonlake_rvp/spd/spd_util.c index 0c2f74781b..2499b32e2d 100644 --- a/src/mainboard/intel/cannonlake_rvp/spd/spd_util.c +++ b/src/mainboard/intel/cannonlake_rvp/spd/spd_util.c @@ -73,8 +73,7 @@ void mainboard_fill_rcomp_res_data(void *rcomp_ptr) void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { /* Rcomp target */ - static const u16 RcompTarget[RCOMP_TARGET_PARAMS] = { - 80, 40, 40, 40, 30 }; + static const u16 RcompTarget[5] = { 80, 40, 40, 40, 30 }; memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); } diff --git a/src/mainboard/intel/icelake_rvp/spd/spd.h b/src/mainboard/intel/icelake_rvp/spd/spd.h index 9b55563209..fbc4919372 100644 --- a/src/mainboard/intel/icelake_rvp/spd/spd.h +++ b/src/mainboard/intel/icelake_rvp/spd/spd.h @@ -16,8 +16,6 @@ #ifndef MAINBOARD_SPD_H #define MAINBOARD_SPD_H -#define RCOMP_TARGET_PARAMS 0x5 - void mainboard_fill_dq_map_ch0(void *dq_map_ptr); void mainboard_fill_dq_map_ch1(void *dq_map_ptr); void mainboard_fill_dqs_map_ch0(void *dqs_map_ptr); diff --git a/src/mainboard/intel/icelake_rvp/spd/spd_util.c b/src/mainboard/intel/icelake_rvp/spd/spd_util.c index d7babbd082..cb4a7928e7 100644 --- a/src/mainboard/intel/icelake_rvp/spd/spd_util.c +++ b/src/mainboard/intel/icelake_rvp/spd/spd_util.c @@ -114,11 +114,11 @@ void mainboard_fill_rcomp_res_data(void *rcomp_ptr) void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { /* Rcomp target */ - static const u16 RcompTarget_DDR4[RCOMP_TARGET_PARAMS] = { + static const u16 RcompTarget_DDR4[5] = { 100, 33, 32, 33, 28 }; - static const u16 RcompTarget_LPDDR4_Ax[RCOMP_TARGET_PARAMS] = { + static const u16 RcompTarget_LPDDR4_Ax[5] = { 80, 40, 40, 40, 30 }; - static const u16 RcompTarget_LPDDR4_Bx[RCOMP_TARGET_PARAMS] = { + static const u16 RcompTarget_LPDDR4_Bx[5] = { 60, 20, 20, 20, 20 }; switch (get_spd_index()) { diff --git a/src/mainboard/intel/kblrvp/spd/spd.h b/src/mainboard/intel/kblrvp/spd/spd.h index 316ff5eb40..e745a25f7b 100644 --- a/src/mainboard/intel/kblrvp/spd/spd.h +++ b/src/mainboard/intel/kblrvp/spd/spd.h @@ -20,8 +20,6 @@ #include #include -#define RCOMP_TARGET_PARAMS 0x5 - 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); diff --git a/src/mainboard/intel/kblrvp/spd/spd_util.c b/src/mainboard/intel/kblrvp/spd/spd_util.c index 4795435a9c..a0a81ba06e 100644 --- a/src/mainboard/intel/kblrvp/spd/spd_util.c +++ b/src/mainboard/intel/kblrvp/spd/spd_util.c @@ -52,8 +52,7 @@ void mainboard_fill_rcomp_res_data(void *rcomp_ptr) void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { /* Rcomp target */ - static const u16 RcompTarget[RCOMP_TARGET_PARAMS] = { - 100, 40, 40, 23, 40 }; + static const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 }; memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); } diff --git a/src/mainboard/intel/kunimitsu/spd/spd.h b/src/mainboard/intel/kunimitsu/spd/spd.h index c6e47f084f..ad6453e7b8 100644 --- a/src/mainboard/intel/kunimitsu/spd/spd.h +++ b/src/mainboard/intel/kunimitsu/spd/spd.h @@ -41,7 +41,6 @@ /* PCH_MEM_CFG[3:0] */ #define MAX_MEMORY_CONFIG 0x10 -#define RCOMP_TARGET_PARAMS 0x5 #define K4E6E304EE_MEM_ID 0x3 static inline int get_spd_index(void) { diff --git a/src/mainboard/intel/kunimitsu/spd/spd_util.c b/src/mainboard/intel/kunimitsu/spd/spd_util.c index 05a0a86734..2fe4596e56 100644 --- a/src/mainboard/intel/kunimitsu/spd/spd_util.c +++ b/src/mainboard/intel/kunimitsu/spd/spd_util.c @@ -55,11 +55,11 @@ void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) mem_cfg_id = get_spd_index(); /* Rcomp target */ - static const u16 RcompTarget[RCOMP_TARGET_PARAMS] = { + static const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 }; /* Strengthen the Rcomp Target Ctrl for 8GB K4E6E304EE -EGCF */ - static const u16 StrengthendRcompTarget[RCOMP_TARGET_PARAMS] = { + static const u16 StrengthendRcompTarget[5] = { 100, 40, 40, 21, 40 }; diff --git a/src/mainboard/intel/saddlebrook/spd/spd.h b/src/mainboard/intel/saddlebrook/spd/spd.h index 70a1f68ce8..d7936636df 100644 --- a/src/mainboard/intel/saddlebrook/spd/spd.h +++ b/src/mainboard/intel/saddlebrook/spd/spd.h @@ -17,8 +17,6 @@ #ifndef MAINBOARD_SPD_H #define MAINBOARD_SPD_H -#define RCOMP_TARGET_PARAMS 0x5 - 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); diff --git a/src/mainboard/intel/saddlebrook/spd/spd_util.c b/src/mainboard/intel/saddlebrook/spd/spd_util.c index a09cebcf4e..b6cf08547a 100644 --- a/src/mainboard/intel/saddlebrook/spd/spd_util.c +++ b/src/mainboard/intel/saddlebrook/spd/spd_util.c @@ -49,7 +49,6 @@ void mainboard_fill_rcomp_res_data(void *rcomp_ptr) void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { /* Rcomp target */ - static const u16 RcompTarget[RCOMP_TARGET_PARAMS] = { - 100, 40, 20, 20, 26 }; + static const u16 RcompTarget[5] = { 100, 40, 20, 20, 26 }; memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); } -- cgit v1.2.3