diff --git a/src/mainboard/system76/gaze16/Kconfig b/src/mainboard/system76/gaze16/Kconfig index 7eea6d97ba..3f69e85e87 100644 --- a/src/mainboard/system76/gaze16/Kconfig +++ b/src/mainboard/system76/gaze16/Kconfig @@ -1,4 +1,4 @@ -if BOARD_SYSTEM76_GAZE16_3050 || BOARD_SYSTEM76_GAZE16_3060 +if BOARD_SYSTEM76_GAZE16_3050 || BOARD_SYSTEM76_GAZE16_3060 || BOARD_SYSTEM76_GAZE16_3060_B config BOARD_SPECIFIC_OPTIONS def_bool y @@ -17,6 +17,7 @@ config BOARD_SPECIFIC_OPTIONS select INTEL_LPSS_UART_FOR_CONSOLE select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_TPM2 + select MAINBOARD_USES_IFD_GBE_REGION if BOARD_SYSTEM76_GAZE16_3060_B select NO_UART_ON_SUPERIO select SOC_INTEL_TIGERLAKE select SOC_INTEL_TIGERLAKE_PCH_H @@ -34,6 +35,7 @@ config MAINBOARD_PART_NUMBER string default "gaze16-3050" if BOARD_SYSTEM76_GAZE16_3050 default "gaze16-3060" if BOARD_SYSTEM76_GAZE16_3060 + default "gaze16-3060-b" if BOARD_SYSTEM76_GAZE16_3060_B config MAINBOARD_SMBIOS_PRODUCT_NAME string @@ -43,11 +45,12 @@ config MAINBOARD_VERSION string default "gaze16-3050" if BOARD_SYSTEM76_GAZE16_3050 default "gaze16-3060" if BOARD_SYSTEM76_GAZE16_3060 + default "gaze16-3060-b" if BOARD_SYSTEM76_GAZE16_3060_B config VARIANT_DIR string default "3050" if BOARD_SYSTEM76_GAZE16_3050 - default "3060" if BOARD_SYSTEM76_GAZE16_3060 + default "3060" if BOARD_SYSTEM76_GAZE16_3060 || BOARD_SYSTEM76_GAZE16_3060_B config OVERRIDE_DEVICETREE string diff --git a/src/mainboard/system76/gaze16/Kconfig.name b/src/mainboard/system76/gaze16/Kconfig.name index ff9e6f5568..1ea29aeb12 100644 --- a/src/mainboard/system76/gaze16/Kconfig.name +++ b/src/mainboard/system76/gaze16/Kconfig.name @@ -3,3 +3,6 @@ config BOARD_SYSTEM76_GAZE16_3050 config BOARD_SYSTEM76_GAZE16_3060 bool "gaze16 3060" + +config BOARD_SYSTEM76_GAZE16_3060_B + bool "gaze16 3060-b" diff --git a/src/mainboard/system76/gaze16/variants/3060/overridetree.cb b/src/mainboard/system76/gaze16/variants/3060/overridetree.cb index 38ec4904e9..2f38dacafe 100644 --- a/src/mainboard/system76/gaze16/variants/3060/overridetree.cb +++ b/src/mainboard/system76/gaze16/variants/3060/overridetree.cb @@ -49,7 +49,7 @@ chip soc/intel/tigerlake # PCIe root port #5 x1, Clock 8 (GLAN) register "PcieRpEnable[4]" = "1" register "PcieRpLtrEnable[4]" = "1" - register "PcieClkSrcUsage[8]" = "4" + #register "PcieClkSrcUsage[8]" = "4" register "PcieClkSrcClkReq[8]" = "8" end device ref pcie_rp7 on @@ -73,5 +73,6 @@ chip soc/intel/tigerlake register "PcieClkSrcUsage[10]" = "8" register "PcieClkSrcClkReq[10]" = "10" end + device ref gbe on end # Some systems use Intel I219-V end end diff --git a/src/mainboard/system76/gaze16/variants/3060/romstage.c b/src/mainboard/system76/gaze16/variants/3060/romstage.c index 6690b4c525..ae822ca5c5 100644 --- a/src/mainboard/system76/gaze16/variants/3060/romstage.c +++ b/src/mainboard/system76/gaze16/variants/3060/romstage.c @@ -1,9 +1,16 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include "../../variant.h" +#include void variant_memory_init_params(FSPM_UPD *mupd) { // Enable M.2 PCIE 4.0 and PEG1 mupd->FspmConfig.CpuPcieRpEnableMask = 0b11; + + // B variant uses Intel GbE + if (CONFIG(BOARD_SYSTEM76_GAZE16_3060_B)) + mupd->FspmConfig.PcieClkSrcUsage[8] = PCIE_CLK_LAN; + else + mupd->FspmConfig.PcieClkSrcUsage[8] = 4; }