From 760e19e18f22780a2d13b2f2621f0bea39d64cbe Mon Sep 17 00:00:00 2001 From: "Johann C. Rode" Date: Thu, 13 Nov 2025 16:47:10 -0800 Subject: [PATCH] mb/lenovo/sklkbl: Use spd_tools infrastructure for SPD binaries For the t470s variant, this patch replaces the vendor SPD binaries for soldered-on RAM with ones generated from spd_tools. This is in preparation for adding variants with more complex onboard RAM configurations. This patch has been successfully validated on hardware (Thinkpad T470s 20JT-S16E00 with 4GB soldered-on RAM and unpopulated DIMM slot). Change-Id: I9cde4f05472105c238b3a8ee94cdedb89db08198 Depends-On: Ied92619130feaa160d01f75bc38230ab6a024ace Signed-off-by: Johann C. Rode Reviewed-on: https://review.coreboot.org/c/coreboot/+/90027 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) --- src/mainboard/lenovo/sklkbl_thinkpad/Kconfig | 2 +- .../lenovo/sklkbl_thinkpad/Makefile.mk | 5 +++ .../lenovo/sklkbl_thinkpad/spd/Makefile.mk | 8 ++++ .../lenovo/sklkbl_thinkpad/spd/spd.c | 39 ++++++++++++++++++ .../lenovo/sklkbl_thinkpad/spd/spd.h | 10 +++++ .../lenovo/sklkbl_thinkpad/variant.h | 2 +- .../variants/t470s/Makefile.mk | 10 ----- .../variants/t470s/memory/Makefile.mk | 19 +++++++++ .../t470s/memory/dram_id.generated.txt | 14 +++++++ .../variants/t470s/memory/mem_parts_used.txt | 8 ++++ .../variants/t470s/memory_init_params.c | 10 ++--- .../variants/t470s/spd/spd_0.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_1.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_10.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_11.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_12.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_13.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_14.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_15.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_16.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_17.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_18.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_19.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_2.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_20.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_3.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_4.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_5.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_6.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_7.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_8.bin | Bin 512 -> 0 bytes .../variants/t470s/spd/spd_9.bin | Bin 512 -> 0 bytes .../variants/t480s/memory_init_params.c | 4 +- 33 files changed, 111 insertions(+), 20 deletions(-) create mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/spd/Makefile.mk create mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/spd/spd.c create mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/spd/spd.h delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/Makefile.mk create mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory/Makefile.mk create mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory/dram_id.generated.txt create mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory/mem_parts_used.txt delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_0.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_1.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_10.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_11.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_12.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_13.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_14.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_15.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_16.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_17.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_18.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_19.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_2.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_20.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_3.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_4.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_5.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_6.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_7.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_8.bin delete mode 100644 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_9.bin diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/Kconfig b/src/mainboard/lenovo/sklkbl_thinkpad/Kconfig index c9b3bcbf0a..8db4676391 100644 --- a/src/mainboard/lenovo/sklkbl_thinkpad/Kconfig +++ b/src/mainboard/lenovo/sklkbl_thinkpad/Kconfig @@ -28,6 +28,7 @@ config BOARD_LENOVO_SKLKBL_THINKPAD_COMMON config BOARD_LENOVO_T470S bool select BOARD_LENOVO_SKLKBL_THINKPAD_COMMON + select HAVE_SPD_IN_CBFS config BOARD_LENOVO_T480 bool @@ -46,7 +47,6 @@ config BOARD_LENOVO_T580 select MEC1653_HAS_DEBUG_UNLOCK select VARIANT_HAS_DGPU - if BOARD_LENOVO_SKLKBL_THINKPAD_COMMON config MAINBOARD_DIR diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/Makefile.mk b/src/mainboard/lenovo/sklkbl_thinkpad/Makefile.mk index 3049190948..8d530b7416 100644 --- a/src/mainboard/lenovo/sklkbl_thinkpad/Makefile.mk +++ b/src/mainboard/lenovo/sklkbl_thinkpad/Makefile.mk @@ -13,6 +13,11 @@ ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainb subdirs-y += variants/$(VARIANT_DIR) +ifeq ($(CONFIG_BOARD_LENOVO_T470S),y) +subdirs-y += variants/$(VARIANT_DIR)/memory +subdirs-y += spd +endif + ifeq ($(CONFIG_VARIANT_HAS_DGPU),y) CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include endif diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/spd/Makefile.mk b/src/mainboard/lenovo/sklkbl_thinkpad/spd/Makefile.mk new file mode 100644 index 0000000000..4024692461 --- /dev/null +++ b/src/mainboard/lenovo/sklkbl_thinkpad/spd/Makefile.mk @@ -0,0 +1,8 @@ +## SPDX-License-Identifier: GPL-2.0-or-later +## + +romstage-y += spd.c + +ifneq ($(SPD_SOURCES),) +LIB_SPD_DEPS := $(SPD_SOURCES) +endif diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/spd/spd.c b/src/mainboard/lenovo/sklkbl_thinkpad/spd/spd.c new file mode 100644 index 0000000000..6ce18e5167 --- /dev/null +++ b/src/mainboard/lenovo/sklkbl_thinkpad/spd/spd.c @@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include +#include + +#include "spd.h" + +/* Get SPD data for on-board memory */ +uint8_t *mainboard_find_spd_data(uint8_t spd_index) +{ + uint8_t *spd_data; + size_t spd_file_len; + char *spd_file; + + spd_file = cbfs_map("spd.bin", &spd_file_len); + if (!spd_file) + die("SPD data not found."); + + if (spd_file_len < ((spd_index + 1) * SPD_SIZE_MAX_DDR4)) { + printk(BIOS_ERR, + "SPD index override to 0 due to incorrect SPD index.\n"); + spd_index = 0; + } + + if (spd_file_len < SPD_SIZE_MAX_DDR4) + die("Missing SPD data (spd.bin size %zu smaller than SPD size %u).", spd_file_len, SPD_SIZE_MAX_DDR4); + + /* Assume same memory in both channels */ + spd_index *= SPD_SIZE_MAX_DDR4; + spd_data = (uint8_t *)(spd_file + spd_index); + + /* Make sure a valid SPD was found */ + if (spd_data[0] == 0) + die("Invalid SPD data."); + + return spd_data; +} diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/spd/spd.h b/src/mainboard/lenovo/sklkbl_thinkpad/spd/spd.h new file mode 100644 index 0000000000..5ff716d86c --- /dev/null +++ b/src/mainboard/lenovo/sklkbl_thinkpad/spd/spd.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef MAINBOARD_SPD_H +#define MAINBOARD_SPD_H + +#include + +uint8_t *mainboard_find_spd_data(uint8_t spd_index); + +#endif diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variant.h b/src/mainboard/lenovo/sklkbl_thinkpad/variant.h index 92255f2e0d..689e50f59b 100644 --- a/src/mainboard/lenovo/sklkbl_thinkpad/variant.h +++ b/src/mainboard/lenovo/sklkbl_thinkpad/variant.h @@ -5,7 +5,7 @@ void variant_config_gpios(void); -int variant_memory_sku(void); +uint8_t variant_memory_sku(void); void ssdt_add_dgpu(const struct device *dev); diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/Makefile.mk b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/Makefile.mk deleted file mode 100644 index a6b399f161..0000000000 --- a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/Makefile.mk +++ /dev/null @@ -1,10 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Add files spd_0.bin to spd_20.bin to the cbfs image -SPD_BINS := $(shell seq 0 20) -define SPD_template -cbfs-files-y += spd_$(1).bin -spd_$(1).bin-file := spd/spd_$(1).bin -spd_$(1).bin-type := raw -endef -$(foreach n,$(SPD_BINS),$(eval $(call SPD_template,$(n)))) diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory/Makefile.mk b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory/Makefile.mk new file mode 100644 index 0000000000..310ad25e59 --- /dev/null +++ b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory/Makefile.mk @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# This is an auto-generated file. Do not edit!! +# Generated by: +# util/spd_tools/bin/part_id_gen TGL ddr4 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory/mem_parts_used.txt + +SPD_SOURCES = +SPD_SOURCES += spd/ddr4/set-0/spd-10.hex # ID = 0(0b0000) Parts = MT40A512M16HA-083E:A +SPD_SOURCES += spd/ddr4/set-0/spd-11.hex # ID = 1(0b0001) Parts = MT40A1G16HBA-083E:A +SPD_SOURCES += spd/ddr4/set-0/spd-10.hex # ID = 2(0b0010) Parts = K4A8G165WB-BCPB +SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex # ID = 3(0b0011) +SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex # ID = 4(0b0100) +SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex # ID = 5(0b0101) +SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex # ID = 6(0b0110) +SPD_SOURCES += spd/ddr4/set-0/spd-empty.hex # ID = 7(0b0111) +SPD_SOURCES += spd/ddr4/set-0/spd-12.hex # ID = 8(0b1000) Parts = MT40A512M16JY-083E:B +SPD_SOURCES += spd/ddr4/set-0/spd-13.hex # ID = 9(0b1001) Parts = MT40A1G16WBU-083E:B +SPD_SOURCES += spd/ddr4/set-0/spd-12.hex # ID = 10(0b1010) Parts = K4A8G165WB-BCRC +SPD_SOURCES += spd/ddr4/set-0/spd-13.hex # ID = 11(0b1011) Parts = K4AAG165WB-MCRC +SPD_SOURCES += spd/ddr4/set-0/spd-12.hex # ID = 12(0b1100) Parts = H5AN8G6NAFR-UHC diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory/dram_id.generated.txt b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory/dram_id.generated.txt new file mode 100644 index 0000000000..a531aa1925 --- /dev/null +++ b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory/dram_id.generated.txt @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# This is an auto-generated file. Do not edit!! +# Generated by: +# util/spd_tools/bin/part_id_gen TGL ddr4 src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory/mem_parts_used.txt + +DRAM Part Name ID to assign +MT40A512M16HA-083E:A 0 (0000) +MT40A1G16HBA-083E:A 1 (0001) +K4A8G165WB-BCPB 2 (0010) +MT40A512M16JY-083E:B 8 (1000) +MT40A1G16WBU-083E:B 9 (1001) +K4A8G165WB-BCRC 10 (1010) +K4AAG165WB-MCRC 11 (1011) +H5AN8G6NAFR-UHC 12 (1100) diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory/mem_parts_used.txt b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory/mem_parts_used.txt new file mode 100644 index 0000000000..22f34363fd --- /dev/null +++ b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory/mem_parts_used.txt @@ -0,0 +1,8 @@ +MT40A512M16HA-083E:A,0 +MT40A1G16HBA-083E:A,1 +K4A8G165WB-BCPB,2 +MT40A512M16JY-083E:B,8 +MT40A1G16WBU-083E:B,9 +K4A8G165WB-BCRC,10 +K4AAG165WB-MCRC,11 +H5AN8G6NAFR-UHC,12 diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory_init_params.c b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory_init_params.c index cc9375808a..6986607c4e 100644 --- a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory_init_params.c +++ b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/memory_init_params.c @@ -6,6 +6,7 @@ #include #include #include +#include "../../spd/spd.h" #include "../../variant.h" static const struct pad_config memory_id_gpio_table[] = { @@ -16,7 +17,7 @@ static const struct pad_config memory_id_gpio_table[] = { PAD_CFG_GPI_TRIG_OWN(GPP_F20, UP_20K, DEEP, OFF, ACPI), /* MEMORYID4 */ }; -int variant_memory_sku(void) +uint8_t variant_memory_sku(void) { gpio_t spd_gpios[] = { GPP_F16, @@ -31,9 +32,7 @@ int variant_memory_sku(void) void mainboard_memory_init_params(FSPM_UPD *mupd) { - int spd_idx; - char spd_name[20]; - size_t spd_size; + uint8_t spd_idx; FSP_M_CONFIG *mem_cfg = &mupd->FspmConfig; mem_cfg->DqPinsInterleaved = true; /* DDR_DQ in interleave mode */ @@ -45,8 +44,7 @@ void mainboard_memory_init_params(FSPM_UPD *mupd) spd_idx = variant_memory_sku(); printk(BIOS_DEBUG, "Detected MEMORY_ID = %d\n", spd_idx); - snprintf(spd_name, sizeof(spd_name), "spd_%d.bin", spd_idx); - mem_cfg->MemorySpdPtr00 = (uintptr_t)cbfs_map(spd_name, &spd_size); + mem_cfg->MemorySpdPtr00 = (uintptr_t)mainboard_find_spd_data(spd_idx); /* Get SPD for memory slot (CH B) */ struct spd_block blk = { .addr_map = { [1] = 0x51, } }; diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_0.bin b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_0.bin deleted file mode 100644 index 86f39ddb55ea9fb58d5e5699637636ef597c734e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmY!u;9+)EWZ+<6U|?oq29gXMJYRrxPEL*>N67~+1r7#Qh7a1t+8`-(puhlu3{YAD YT>%dM8_BI;nL`dsaHtp+rc($20I8n}l>h($ diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_1.bin b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_1.bin deleted file mode 100644 index df0f6e58b79286a4aeb690c5027adf7a1f5f668b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmY!u;9+i6oWQ}rz`)GN3?vyic)kGXoSYm%j*<^t3LFfq3@hZcwLwzoK!E`Q8KATR Yx&j>hH(SqvWezd%<4`dwOs5b40B_I==>Px# diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_10.bin b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_10.bin deleted file mode 100644 index 24f0d8992bc5244c62488da9633e4885f52f3e22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmY!ucy&~OfFg0G3Wp`)phiHWn5fv$6q PvjPw>z-1}5hGzN!nb#F$ diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_11.bin b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_11.bin deleted file mode 100644 index 59b6b9e78263c42aae367ab7d4a784d888f30efe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmY!ucy(6E*fVuXjUqlKwqu$iMg7pDLK diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_14.bin b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_14.bin deleted file mode 100644 index a2a64a5e1adada3fc00b2e4edc60c77e610881a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmY!u<-XH%N8S?V-1R3%^a4B#wurhqmHql_HU=XnZ$x{Q& z*$Oh{IYWaWKO+-03?$Qx1CPkm2-nu217(^xhPas;8kw1RMCls2o4FbS#SI&DT;VDQ GCj$V){1T)9 diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_15.bin b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_15.bin deleted file mode 100644 index a2a64a5e1adada3fc00b2e4edc60c77e610881a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmY!u<-XH%N8S?V-1R3%^a4B#wurhqmHql_HU=XnZ$x{Q& z*$Oh{IYWaWKO+-03?$Qx1CPkm2-nu217(^xhPas;8kw1RMCls2o4FbS#SI&DT;VDQ GCj$V){1T)9 diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_16.bin b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_16.bin deleted file mode 100644 index a64a5a93fb4aef4d5f63d79cb2582731b9ac5063..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 NcmZQz7zHCa1ONg600961 diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_17.bin b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_17.bin deleted file mode 100644 index 5f23e86606094d3e5d2011db902ebd4a500bbffa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmY!u<-XHc140(BZf(&^dxD+@TSQ$QOn`kgpFo@WIT6 z8Mi42GcX`n2w8lrIa@)p&l&!{<7bq|r;x^SwThHl(6E*fVuXjUqobjFu$i-OkeQ!u Vn70BDFf^?FkI#a;_$28g2LNS*7)Ag9 diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_19.bin b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_19.bin deleted file mode 100644 index 857da9c9828cdac842329f6cef4539283777268b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmY!uenuv07)YiW2Og2B5w5L42g)>Y3~@6xG%_>sh|)E7H}WzBiW@fQc)?W; GP6hy+m=i1j diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_2.bin b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_2.bin deleted file mode 100644 index b5b14cf2dfa06ae183b0379da4dc825129e1589f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmY!u;9+)EWZ+<6U|?oq29gXMJU@VRUS6IcN7)B11r7#Qh7a1tdLSuupuhlu3{YAD XT>%b$v*cE=%%S%6I8=-Z(%b$+tzbnnL|62aHtp+rc($20QGqazW@LL diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_4.bin b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_4.bin deleted file mode 100644 index 829f149547bc24859646c33d5926938d7a1b90cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmY!u;9+)EWZ+<6U|?oq29gXMJYRrxPEL*>N67~+1r7#Qh7a1tdLSuupuhlu3{YAD XT>%b$o8(ro%%OI594bbI=@bG0z{d&v diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_5.bin b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_5.bin deleted file mode 100644 index a64a5a93fb4aef4d5f63d79cb2582731b9ac5063..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 NcmZQz7zHCa1ONg600961 diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_6.bin b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_6.bin deleted file mode 100644 index a64a5a93fb4aef4d5f63d79cb2582731b9ac5063..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 NcmZQz7zHCa1ONg600961 diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_7.bin b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_7.bin deleted file mode 100644 index 940f1e3cd8e5bd9ea32a82a14edcdcbc8132d8c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmY!u<-XH%N8S?V-1R3%^a4B#wurjQW(9mG0U=XnZ$x{Q& z0UPq1A)%L_QJxwGl4(Y*BAFWD+8T7AOcTeDU_*B^6OSleBX=`bLy)jxgN`d)<=|uh E020*^DF6Tf diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_8.bin b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t470s/spd/spd_8.bin deleted file mode 100644 index 30c84410d417ef7afa8705c93cdb64a9f4e915a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmY!uW!enxp}7)YiWinU~FgllWifig`TLxK(6%}hL^bdB7N9Ss$Lz^FmT39fQ* FG5`?&65ap+ diff --git a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t480s/memory_init_params.c b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t480s/memory_init_params.c index 3cbca9ae6c..bb3152f62c 100644 --- a/src/mainboard/lenovo/sklkbl_thinkpad/variants/t480s/memory_init_params.c +++ b/src/mainboard/lenovo/sklkbl_thinkpad/variants/t480s/memory_init_params.c @@ -16,7 +16,7 @@ static const struct pad_config memory_id_gpio_table[] = { PAD_CFG_GPI_TRIG_OWN(GPP_F20, UP_20K, DEEP, OFF, ACPI), /* MEMORYID4 */ }; -int variant_memory_sku(void) +uint8_t variant_memory_sku(void) { gpio_t spd_gpios[] = { GPP_F16, @@ -31,7 +31,7 @@ int variant_memory_sku(void) void mainboard_memory_init_params(FSPM_UPD *mupd) { - int spd_idx; + uint8_t spd_idx; char spd_name[20]; size_t spd_size;