summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2019-07-11 22:38:42 -0700
committerFurquan Shaikh <furquan@google.com>2019-07-18 14:44:26 +0000
commit463fca43623d385f486a72444c8e30cbb9b3e9d3 (patch)
tree7dbd1be09a87018d6052e448ad5f97f6409f014e
parent2af2f2c8cad259ec9ea4d8b217e86a19db2c0d82 (diff)
downloadcoreboot-463fca43623d385f486a72444c8e30cbb9b3e9d3.tar.gz
coreboot-463fca43623d385f486a72444c8e30cbb9b3e9d3.tar.bz2
coreboot-463fca43623d385f486a72444c8e30cbb9b3e9d3.zip
mb/google/hatch: Add support for variant_memory_sku()
This change adds support for variant_memory_sku() that allows variant to return memory SKU ID. Current implementation of memory_sku() is renamed to weak implementation of variant_memory_sku(). Functionally this change should be the same as before for all hatch variants. This function will be overriden by helios in a follow-up CL. BUG=b:133455595 Change-Id: I509c263ec08e0060c12ef1ea9fed673f1e3f3a41 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34251 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
-rw-r--r--src/mainboard/google/hatch/romstage.c4
-rw-r--r--src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/mainboard/google/hatch/romstage.c b/src/mainboard/google/hatch/romstage.c
index 69fee2802556..a94fab5df9c9 100644
--- a/src/mainboard/google/hatch/romstage.c
+++ b/src/mainboard/google/hatch/romstage.c
@@ -29,7 +29,7 @@
*/
#define GPIO_MEM_CH_SEL GPP_F2
-static int memory_sku(void)
+int __weak variant_memory_sku(void)
{
const gpio_t spd_gpios[] = {
GPIO_MEM_CONFIG_0,
@@ -48,7 +48,7 @@ void mainboard_memory_init_params(FSPM_UPD *memupd)
int is_single_ch_mem;
variant_memory_params(&memcfg);
- mem_sku = memory_sku();
+ mem_sku = variant_memory_sku();
/*
* GPP_F2 is the MEM_CH_SEL gpio, which is set to 1 for single
* channel skus and 0 for dual channel skus.
diff --git a/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h
index 17bd5df63d1c..864d140f0e2e 100644
--- a/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/hatch/variants/baseboard/include/baseboard/variants.h
@@ -34,6 +34,9 @@ const struct pad_config *override_early_gpio_table(size_t *num);
/* Return board specific memory configuration */
void variant_memory_params(struct cnl_mb_cfg *bcfg);
+/* Return memory SKU for the variant */
+int variant_memory_sku(void);
+
/* Return variant specific gpio pads to be configured during sleep */
const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num);