From 903c9764a16fba61bf90187d6f7e2afde37cfec0 Mon Sep 17 00:00:00 2001 From: Lijian Zhao Date: Mon, 20 Aug 2018 14:06:13 -0700 Subject: soc/intel/cannonlake: Change LPDDR4 to MEMCFG Modify the previously SOC_CNL_LPDDR4_INIT to SOC_CNL_MEMCFG_INIT, to make the infrasturture to handle both LPDDR4 and DDR4 cases in the future. Consider the case of reading SPD from SMBus other than providing SPD pointer directly. BUG=N/A TEST=Verify "./util/abuild/abuild -p none -t google/zoombini -x -a" compiles successfully. Change-Id: I2f898147f67dd52b89cc3d9fc4e6b3854fa81f57 Signed-off-by: Lijian Zhao Reviewed-on: https://review.coreboot.org/28248 Reviewed-by: Nick Vaccaro Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- .../variants/baseboard/include/baseboard/variants.h | 4 ++-- src/mainboard/google/zoombini/variants/meowth/memory.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/mainboard/google/zoombini/variants') diff --git a/src/mainboard/google/zoombini/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/zoombini/variants/baseboard/include/baseboard/variants.h index eab081da54..eac0feea6f 100644 --- a/src/mainboard/google/zoombini/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/zoombini/variants/baseboard/include/baseboard/variants.h @@ -17,7 +17,7 @@ #ifndef __BASEBOARD_VARIANTS_H__ #define __BASEBOARD_VARIANTS_H__ -#include +#include #include #include #include @@ -35,7 +35,7 @@ const struct pad_config *variant_early_gpio_table(size_t *num); const struct cros_gpio *variant_cros_gpios(size_t *num); /* Return LPDDR4 configuration structure. */ -const struct lpddr4_cfg *variant_lpddr4_config(void); +const struct cnl_mb_cfg *variant_lpddr4_config(void); /* Return memory SKU for the board. */ size_t variant_memory_sku(void); diff --git a/src/mainboard/google/zoombini/variants/meowth/memory.c b/src/mainboard/google/zoombini/variants/meowth/memory.c index c72ffeab4f..02c9ab9048 100644 --- a/src/mainboard/google/zoombini/variants/meowth/memory.c +++ b/src/mainboard/google/zoombini/variants/meowth/memory.c @@ -16,10 +16,10 @@ #include #include #include -#include +#include -static const struct lpddr4_cfg meowth_lpddr4_cfg = { - .dq_map[LP4_CH0] = { +static const struct cnl_mb_cfg meowth_lpddr4_cfg = { + .dq_map[DDR_CH0] = { /* * CLK0 goes to package 0 - Bytes[3:0], * CLK1 goes to package 1 - Bytes[7:4] @@ -36,7 +36,7 @@ static const struct lpddr4_cfg meowth_lpddr4_cfg = { { 0xFF, 0x00 }, }, - .dq_map[LP4_CH1] = { + .dq_map[DDR_CH1] = { /* * CLK0 goes to package 0 - Bytes[3:0], * CLK1 goes to package 1 - Bytes[7:4] @@ -65,8 +65,8 @@ static const struct lpddr4_cfg meowth_lpddr4_cfg = { * and it will translate that and display 8 values per channel. * Those values are copied into the dqs_map arrays below. */ - .dqs_map[LP4_CH0] = { 3, 1, 2, 0, 7, 5, 6, 4 }, - .dqs_map[LP4_CH1] = { 2, 3, 1, 0, 7, 5, 6, 4 }, + .dqs_map[DDR_CH0] = { 3, 1, 2, 0, 7, 5, 6, 4 }, + .dqs_map[DDR_CH1] = { 2, 3, 1, 0, 7, 5, 6, 4 }, /* Meowth uses three 100 Ohm rcomp resistors */ .rcomp_resistor = { 100, 100, 100 }, @@ -86,7 +86,7 @@ static const struct lpddr4_cfg meowth_lpddr4_cfg = { .ect = 1, }; -const struct lpddr4_cfg *variant_lpddr4_config(void) +const struct cnl_mb_cfg *variant_lpddr4_config(void) { return &meowth_lpddr4_cfg; } -- cgit v1.2.3