Sean Rhodes has submitted this change. ( https://review.coreboot.org/c/coreboot/+/87067?usp=email )
Change subject: mb/starlabs/byte_adl/cfr: Drop CONFIG guards for CFR elements ......................................................................
mb/starlabs/byte_adl/cfr: Drop CONFIG guards for CFR elements
The byte_adl is an Alderlake board, so we don't need to do any SoC checks to determine which CFR elements to include.
TEST=build/boot starlabs/byte_adl, verify CFR options unchanged.
Change-Id: Ie21a873ad7af1504f46db769c3abba00c0e61008 Signed-off-by: Matt DeVillier matt.devillier@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/87067 Reviewed-by: Sean Rhodes sean@starlabs.systems Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/starlabs/byte_adl/cfr.c 1 file changed, 0 insertions(+), 8 deletions(-)
Approvals: build bot (Jenkins): Verified Sean Rhodes: Looks good to me, approved
diff --git a/src/mainboard/starlabs/byte_adl/cfr.c b/src/mainboard/starlabs/byte_adl/cfr.c index 81d74b9..442326f 100644 --- a/src/mainboard/starlabs/byte_adl/cfr.c +++ b/src/mainboard/starlabs/byte_adl/cfr.c @@ -38,14 +38,12 @@ SM_ENUM_VALUE_END }, });
-#if CONFIG(SOC_INTEL_TIGERLAKE) || CONFIG(SOC_INTEL_ALDERLAKE) || CONFIG(SOC_INTEL_RAPTORLAKE) static const struct sm_object gna = SM_DECLARE_BOOL({ .opt_name = "gna", .ui_name = "Gaussian & Neural Accelerator", .ui_helptext = "Enable or Disable the Gaussian & Neural Accelerator", .default_value = false, }); -#endif
static const struct sm_object me_state = SM_DECLARE_ENUM({ .opt_name = "me_state", @@ -84,7 +82,6 @@ SM_ENUM_VALUE_END }, });
-#if CONFIG(SOC_INTEL_ALDERLAKE) static const struct sm_object pciexp_aspm = SM_DECLARE_ENUM({ .opt_name = "pciexp_aspm", .ui_name = "PCI ASPM", @@ -124,7 +121,6 @@ { "L1.2", L1_SS_L1_2 }, SM_ENUM_VALUE_END }, }); -#endif
static const struct sm_object reboot_counter = SM_DECLARE_NUMBER({ .opt_name = "reboot_counter", @@ -169,9 +165,7 @@ static struct sm_obj_form devices = { .ui_name = "Devices", .obj_list = (const struct sm_object *[]) { - #if CONFIG(SOC_INTEL_TIGERLAKE) || CONFIG(SOC_INTEL_ALDERLAKE) || CONFIG(SOC_INTEL_RAPTORLAKE) &gna, - #endif NULL }, }; @@ -179,11 +173,9 @@ static struct sm_obj_form pci = { .ui_name = "PCI", .obj_list = (const struct sm_object *[]) { - #if CONFIG(SOC_INTEL_ALDERLAKE) &pciexp_clk_pm, &pciexp_aspm, &pciexp_l1ss, - #endif NULL }, };