From 7622a57771e6222ce3bb75a38e886fd41376a2cf Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Mon, 25 Aug 2025 20:51:41 +0100 Subject: [PATCH] mb/starlabs/common: Move the SMBIOS code to common directory This avoids storing the same files in 5 different places in the tree. Change-Id: I84bd5705613947444f48331d1a2d06b1ab71b2f3 Signed-off-by: Sean Rhodes Reviewed-on: https://review.coreboot.org/c/coreboot/+/88943 Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier --- src/mainboard/starlabs/byte_adl/Makefile.mk | 1 - src/mainboard/starlabs/common/Kconfig | 13 +++++++ src/mainboard/starlabs/common/Makefile.mk | 3 ++ .../starlabs/common/smbios/Makefile.mk | 3 ++ .../{byte_adl => common/smbios}/smbios.c | 2 +- src/mainboard/starlabs/lite/Makefile.mk | 1 - src/mainboard/starlabs/lite/smbios.c | 38 ------------------ src/mainboard/starlabs/starbook/Makefile.mk | 1 - src/mainboard/starlabs/starbook/smbios.c | 39 ------------------- .../starlabs/starfighter/Makefile.mk | 1 - src/mainboard/starlabs/starfighter/smbios.c | 39 ------------------- .../starlabs/starlite_adl/Makefile.mk | 1 - src/mainboard/starlabs/starlite_adl/smbios.c | 39 ------------------- 13 files changed, 20 insertions(+), 161 deletions(-) create mode 100644 src/mainboard/starlabs/common/Kconfig create mode 100644 src/mainboard/starlabs/common/Makefile.mk create mode 100644 src/mainboard/starlabs/common/smbios/Makefile.mk rename src/mainboard/starlabs/{byte_adl => common/smbios}/smbios.c (97%) delete mode 100644 src/mainboard/starlabs/lite/smbios.c delete mode 100644 src/mainboard/starlabs/starbook/smbios.c delete mode 100644 src/mainboard/starlabs/starfighter/smbios.c delete mode 100644 src/mainboard/starlabs/starlite_adl/smbios.c diff --git a/src/mainboard/starlabs/byte_adl/Makefile.mk b/src/mainboard/starlabs/byte_adl/Makefile.mk index 677db61b19..678662b55d 100644 --- a/src/mainboard/starlabs/byte_adl/Makefile.mk +++ b/src/mainboard/starlabs/byte_adl/Makefile.mk @@ -11,4 +11,3 @@ romstage-$(CONFIG_VBOOT) += vboot.c ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c ramstage-y += mainboard.c -ramstage-y += smbios.c diff --git a/src/mainboard/starlabs/common/Kconfig b/src/mainboard/starlabs/common/Kconfig new file mode 100644 index 0000000000..4670672cb7 --- /dev/null +++ b/src/mainboard/starlabs/common/Kconfig @@ -0,0 +1,13 @@ +## SPDX-License-Identifier: GPL-2.0-only + +if VENDOR_STARLABS + +menu "Star Labs Settings" + +config MB_COMMON_DIR + string + default "starlabs/common" + +endmenu + +endif diff --git a/src/mainboard/starlabs/common/Makefile.mk b/src/mainboard/starlabs/common/Makefile.mk new file mode 100644 index 0000000000..3979986e57 --- /dev/null +++ b/src/mainboard/starlabs/common/Makefile.mk @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +subdirs-$(CONFIG_VENDOR_STARLABS) += smbios diff --git a/src/mainboard/starlabs/common/smbios/Makefile.mk b/src/mainboard/starlabs/common/smbios/Makefile.mk new file mode 100644 index 0000000000..ae6163b99a --- /dev/null +++ b/src/mainboard/starlabs/common/smbios/Makefile.mk @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +ramstage-y += smbios.c diff --git a/src/mainboard/starlabs/byte_adl/smbios.c b/src/mainboard/starlabs/common/smbios/smbios.c similarity index 97% rename from src/mainboard/starlabs/byte_adl/smbios.c rename to src/mainboard/starlabs/common/smbios/smbios.c index ab2c211a99..00e6f249c7 100644 --- a/src/mainboard/starlabs/byte_adl/smbios.c +++ b/src/mainboard/starlabs/common/smbios/smbios.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include +#include #include #include #include diff --git a/src/mainboard/starlabs/lite/Makefile.mk b/src/mainboard/starlabs/lite/Makefile.mk index 65a5241f39..acf62c2753 100644 --- a/src/mainboard/starlabs/lite/Makefile.mk +++ b/src/mainboard/starlabs/lite/Makefile.mk @@ -12,5 +12,4 @@ romstage-$(CONFIG_VBOOT) += vboot.c ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c ramstage-y += devtree.c ramstage-y += mainboard.c -ramstage-y += smbios.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads diff --git a/src/mainboard/starlabs/lite/smbios.c b/src/mainboard/starlabs/lite/smbios.c deleted file mode 100644 index 5b85f501fd..0000000000 --- a/src/mainboard/starlabs/lite/smbios.c +++ /dev/null @@ -1,38 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include -#include -#include -#include -#include - -/* Get the Embedded Controller firmware version */ -void smbios_ec_revision(uint8_t *ec_major_revision, uint8_t *ec_minor_revision) -{ - u16 ec_version = ec_get_version(); - - *ec_major_revision = ec_version >> 8; - *ec_minor_revision = ec_version & 0xff; -} - -const char *smbios_system_sku(void) -{ - return CONFIG_MAINBOARD_FAMILY; -} - -u8 smbios_mainboard_feature_flags(void) -{ - return SMBIOS_FEATURE_FLAGS_HOSTING_BOARD | SMBIOS_FEATURE_FLAGS_REPLACEABLE; -} - -const char *smbios_chassis_version(void) -{ - return smbios_mainboard_version(); -} - -const char *smbios_chassis_serial_number(void) -{ - return smbios_mainboard_serial_number(); -} diff --git a/src/mainboard/starlabs/starbook/Makefile.mk b/src/mainboard/starlabs/starbook/Makefile.mk index 581c8613f6..1a8996f1b2 100644 --- a/src/mainboard/starlabs/starbook/Makefile.mk +++ b/src/mainboard/starlabs/starbook/Makefile.mk @@ -13,5 +13,4 @@ romstage-$(CONFIG_VBOOT) += vboot.c ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c ramstage-y += hda_verb.c ramstage-y += mainboard.c -ramstage-y += smbios.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads diff --git a/src/mainboard/starlabs/starbook/smbios.c b/src/mainboard/starlabs/starbook/smbios.c deleted file mode 100644 index ab2c211a99..0000000000 --- a/src/mainboard/starlabs/starbook/smbios.c +++ /dev/null @@ -1,39 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include -#include -#include -#include -#include -#include - -/* Get the Embedded Controller firmware version */ -void smbios_ec_revision(uint8_t *ec_major_revision, uint8_t *ec_minor_revision) -{ - u16 ec_version = ec_get_version(); - - *ec_major_revision = ec_version >> 8; - *ec_minor_revision = ec_version & 0xff; -} - -const char *smbios_system_sku(void) -{ - return CONFIG_MAINBOARD_FAMILY; -} - -u8 smbios_mainboard_feature_flags(void) -{ - return SMBIOS_FEATURE_FLAGS_HOSTING_BOARD | SMBIOS_FEATURE_FLAGS_REPLACEABLE; -} - -const char *smbios_chassis_version(void) -{ - return smbios_mainboard_version(); -} - -const char *smbios_chassis_serial_number(void) -{ - return smbios_mainboard_serial_number(); -} diff --git a/src/mainboard/starlabs/starfighter/Makefile.mk b/src/mainboard/starlabs/starfighter/Makefile.mk index f35c14f0b3..59e8f76e8f 100644 --- a/src/mainboard/starlabs/starfighter/Makefile.mk +++ b/src/mainboard/starlabs/starfighter/Makefile.mk @@ -9,5 +9,4 @@ bootblock-y += bootblock.c ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c ramstage-y += hda_verb.c ramstage-y += mainboard.c -ramstage-y += smbios.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads diff --git a/src/mainboard/starlabs/starfighter/smbios.c b/src/mainboard/starlabs/starfighter/smbios.c deleted file mode 100644 index ab2c211a99..0000000000 --- a/src/mainboard/starlabs/starfighter/smbios.c +++ /dev/null @@ -1,39 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include -#include -#include -#include -#include -#include - -/* Get the Embedded Controller firmware version */ -void smbios_ec_revision(uint8_t *ec_major_revision, uint8_t *ec_minor_revision) -{ - u16 ec_version = ec_get_version(); - - *ec_major_revision = ec_version >> 8; - *ec_minor_revision = ec_version & 0xff; -} - -const char *smbios_system_sku(void) -{ - return CONFIG_MAINBOARD_FAMILY; -} - -u8 smbios_mainboard_feature_flags(void) -{ - return SMBIOS_FEATURE_FLAGS_HOSTING_BOARD | SMBIOS_FEATURE_FLAGS_REPLACEABLE; -} - -const char *smbios_chassis_version(void) -{ - return smbios_mainboard_version(); -} - -const char *smbios_chassis_serial_number(void) -{ - return smbios_mainboard_serial_number(); -} diff --git a/src/mainboard/starlabs/starlite_adl/Makefile.mk b/src/mainboard/starlabs/starlite_adl/Makefile.mk index aab03f5d03..17c1dc2f4d 100644 --- a/src/mainboard/starlabs/starlite_adl/Makefile.mk +++ b/src/mainboard/starlabs/starlite_adl/Makefile.mk @@ -13,4 +13,3 @@ romstage-$(CONFIG_VBOOT) += vboot.c ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c ramstage-y += hda_verb.c ramstage-y += mainboard.c -ramstage-y += smbios.c diff --git a/src/mainboard/starlabs/starlite_adl/smbios.c b/src/mainboard/starlabs/starlite_adl/smbios.c deleted file mode 100644 index ab2c211a99..0000000000 --- a/src/mainboard/starlabs/starlite_adl/smbios.c +++ /dev/null @@ -1,39 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include -#include -#include -#include -#include -#include - -/* Get the Embedded Controller firmware version */ -void smbios_ec_revision(uint8_t *ec_major_revision, uint8_t *ec_minor_revision) -{ - u16 ec_version = ec_get_version(); - - *ec_major_revision = ec_version >> 8; - *ec_minor_revision = ec_version & 0xff; -} - -const char *smbios_system_sku(void) -{ - return CONFIG_MAINBOARD_FAMILY; -} - -u8 smbios_mainboard_feature_flags(void) -{ - return SMBIOS_FEATURE_FLAGS_HOSTING_BOARD | SMBIOS_FEATURE_FLAGS_REPLACEABLE; -} - -const char *smbios_chassis_version(void) -{ - return smbios_mainboard_version(); -} - -const char *smbios_chassis_serial_number(void) -{ - return smbios_mainboard_serial_number(); -}