From 53b99a84a59b8eab1e17498e9dd217a0235b4174 Mon Sep 17 00:00:00 2001 From: Nick Vaccaro Date: Thu, 1 Oct 2020 00:37:38 -0700 Subject: soc/intel: remove duplicate weak versions of mainboard_get_dram_part_num() Consolidate all weak declarations of mainboard_get_dram_part_num() to instead use the common definition in lib/spd_bin.c. BUG=b:168724473 TEST="emerge-volteer coreboot && emerge-nocturne coreboot && emerge-dedede coreboot" and verify build succeeds without error. Change-Id: I322899c080ab7ebcf1cdcad3ce3dfa1d022864d1 Signed-off-by: Nick Vaccaro Reviewed-on: https://review.coreboot.org/c/coreboot/+/45890 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/lib/spd_bin.c | 7 +++++++ src/soc/intel/alderlake/romstage/romstage.c | 6 ------ src/soc/intel/cannonlake/romstage/romstage.c | 6 ------ src/soc/intel/elkhartlake/romstage/romstage.c | 6 ------ src/soc/intel/jasperlake/romstage/romstage.c | 6 ------ src/soc/intel/tigerlake/romstage/romstage.c | 6 ------ 6 files changed, 7 insertions(+), 30 deletions(-) diff --git a/src/lib/spd_bin.c b/src/lib/spd_bin.c index 38888961b3..aeed204a85 100644 --- a/src/lib/spd_bin.c +++ b/src/lib/spd_bin.c @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -17,6 +18,12 @@ void dump_spd_info(struct spd_block *blk) } } +const char * __weak mainboard_get_dram_part_num(void) +{ + /* Default weak implementation, no need to override part number. */ + return NULL; +} + static bool use_ddr4_params(int dram_type) { switch (dram_type) { diff --git a/src/soc/intel/alderlake/romstage/romstage.c b/src/soc/intel/alderlake/romstage/romstage.c index 32657c78c4..6cd22d018a 100644 --- a/src/soc/intel/alderlake/romstage/romstage.c +++ b/src/soc/intel/alderlake/romstage/romstage.c @@ -21,12 +21,6 @@ 0x8d, 0x09, 0x11, 0xcf, 0x8b, 0x9f, 0x03, 0x23 \ } -const char * __weak mainboard_get_dram_part_num(void) -{ - /* Default weak implementation, no need to override part number. */ - return NULL; -} - /* Save the DIMM information for SMBIOS table 17 */ static void save_dimm_info(void) { diff --git a/src/soc/intel/cannonlake/romstage/romstage.c b/src/soc/intel/cannonlake/romstage/romstage.c index e8947f1ea4..0bf0404ab9 100644 --- a/src/soc/intel/cannonlake/romstage/romstage.c +++ b/src/soc/intel/cannonlake/romstage/romstage.c @@ -23,12 +23,6 @@ 0x8d, 0x09, 0x11, 0xcf, 0x8b, 0x9f, 0x03, 0x23 \ } -const char * __weak mainboard_get_dram_part_num(void) -{ - /* Default weak implementation, no need to override part number. */ - return NULL; -} - /* Save the DIMM information for SMBIOS table 17 */ static void save_dimm_info(void) { diff --git a/src/soc/intel/elkhartlake/romstage/romstage.c b/src/soc/intel/elkhartlake/romstage/romstage.c index 06fa11400e..ae9cc4afe6 100644 --- a/src/soc/intel/elkhartlake/romstage/romstage.c +++ b/src/soc/intel/elkhartlake/romstage/romstage.c @@ -21,12 +21,6 @@ 0x8d, 0x09, 0x11, 0xcf, 0x8b, 0x9f, 0x03, 0x23 \ } -const char * __weak mainboard_get_dram_part_num(void) -{ - /* Default implementation, no need to override part number. */ - return NULL; -} - /* Save the DIMM information for SMBIOS table 17 */ static void save_dimm_info(void) { diff --git a/src/soc/intel/jasperlake/romstage/romstage.c b/src/soc/intel/jasperlake/romstage/romstage.c index 6fddbc4f44..1fa6c2d180 100644 --- a/src/soc/intel/jasperlake/romstage/romstage.c +++ b/src/soc/intel/jasperlake/romstage/romstage.c @@ -21,12 +21,6 @@ 0x8d, 0x09, 0x11, 0xcf, 0x8b, 0x9f, 0x03, 0x23 \ } -const char * __weak mainboard_get_dram_part_num(void) -{ - /* Default weak implementation, no need to override part number. */ - return NULL; -} - /* Save the DIMM information for SMBIOS table 17 */ static void save_dimm_info(void) { diff --git a/src/soc/intel/tigerlake/romstage/romstage.c b/src/soc/intel/tigerlake/romstage/romstage.c index 6fddbc4f44..1fa6c2d180 100644 --- a/src/soc/intel/tigerlake/romstage/romstage.c +++ b/src/soc/intel/tigerlake/romstage/romstage.c @@ -21,12 +21,6 @@ 0x8d, 0x09, 0x11, 0xcf, 0x8b, 0x9f, 0x03, 0x23 \ } -const char * __weak mainboard_get_dram_part_num(void) -{ - /* Default weak implementation, no need to override part number. */ - return NULL; -} - /* Save the DIMM information for SMBIOS table 17 */ static void save_dimm_info(void) { -- cgit v1.2.3