sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/system76/gaze16: 3060: Add variant for I219-V GbE

Browse Source 
Some models use Intel I219-V instead of the Realtek RTL8111 controller.
Introduce a new variant so the IFD of the Realtek board does not have
the onboard LAN enabled when it is not connected.

Change-Id: I1961a7a8fac2dc6e81ebae013ff62cd491fba43c
Signed-off-by: Tim Crawford <tcrawford@system76.com>
This commit is contained in:
Tim Crawford
2021-11-01 10:07:35 -06:00
committed by Jeremy Soller
parent bd8464fa0e
commit 402586773e
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mainboard/system76/gaze16/Kconfig
View File

@@ -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 config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
@@ -17,6 +17,7 @@ config BOARD_SPECIFIC_OPTIONS
select INTEL_LPSS_UART_FOR_CONSOLE select INTEL_LPSS_UART_FOR_CONSOLE
select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_LPC_TPM
select MAINBOARD_HAS_TPM2 select MAINBOARD_HAS_TPM2
select MAINBOARD_USES_IFD_GBE_REGION if BOARD_SYSTEM76_GAZE16_3060_B
select NO_UART_ON_SUPERIO select NO_UART_ON_SUPERIO
select SOC_INTEL_TIGERLAKE select SOC_INTEL_TIGERLAKE
select SOC_INTEL_TIGERLAKE_PCH_H select SOC_INTEL_TIGERLAKE_PCH_H
@@ -34,6 +35,7 @@ config MAINBOARD_PART_NUMBER
string string
default "gaze16-3050" if BOARD_SYSTEM76_GAZE16_3050 default "gaze16-3050" if BOARD_SYSTEM76_GAZE16_3050
default "gaze16-3060" if BOARD_SYSTEM76_GAZE16_3060 default "gaze16-3060" if BOARD_SYSTEM76_GAZE16_3060
default "gaze16-3060-b" if BOARD_SYSTEM76_GAZE16_3060_B
config MAINBOARD_SMBIOS_PRODUCT_NAME config MAINBOARD_SMBIOS_PRODUCT_NAME
string string
@@ -43,11 +45,12 @@ config MAINBOARD_VERSION
string string
default "gaze16-3050" if BOARD_SYSTEM76_GAZE16_3050 default "gaze16-3050" if BOARD_SYSTEM76_GAZE16_3050
default "gaze16-3060" if BOARD_SYSTEM76_GAZE16_3060 default "gaze16-3060" if BOARD_SYSTEM76_GAZE16_3060
default "gaze16-3060-b" if BOARD_SYSTEM76_GAZE16_3060_B
config VARIANT_DIR config VARIANT_DIR
string string
default "3050" if BOARD_SYSTEM76_GAZE16_3050 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 config OVERRIDE_DEVICETREE
string string

3
src/mainboard/system76/gaze16/Kconfig.name
View File

@@ -3,3 +3,6 @@ config BOARD_SYSTEM76_GAZE16_3050
config BOARD_SYSTEM76_GAZE16_3060 config BOARD_SYSTEM76_GAZE16_3060
bool "gaze16 3060" bool "gaze16 3060"
config BOARD_SYSTEM76_GAZE16_3060_B
bool "gaze16 3060-b"

3
src/mainboard/system76/gaze16/variants/3060/overridetree.cb
View File

@@ -49,7 +49,7 @@ chip soc/intel/tigerlake
# PCIe root port #5 x1, Clock 8 (GLAN) # PCIe root port #5 x1, Clock 8 (GLAN)
register "PcieRpEnable[4]" = "1" register "PcieRpEnable[4]" = "1"
register "PcieRpLtrEnable[4]" = "1" register "PcieRpLtrEnable[4]" = "1"
register "PcieClkSrcUsage[8]" = "4" #register "PcieClkSrcUsage[8]" = "4"
register "PcieClkSrcClkReq[8]" = "8" register "PcieClkSrcClkReq[8]" = "8"
end end
device ref pcie_rp7 on device ref pcie_rp7 on
@@ -73,5 +73,6 @@ chip soc/intel/tigerlake
register "PcieClkSrcUsage[10]" = "8" register "PcieClkSrcUsage[10]" = "8"
register "PcieClkSrcClkReq[10]" = "10" register "PcieClkSrcClkReq[10]" = "10"
end end
device ref gbe on end # Some systems use Intel I219-V
end end
end end

7
src/mainboard/system76/gaze16/variants/3060/romstage.c
View File

@@ -1,9 +1,16 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include "../../variant.h" #include "../../variant.h"
#include <soc/pch.h>
void variant_memory_init_params(FSPM_UPD *mupd) void variant_memory_init_params(FSPM_UPD *mupd)
{ {
// Enable M.2 PCIE 4.0 and PEG1 // Enable M.2 PCIE 4.0 and PEG1
mupd->FspmConfig.CpuPcieRpEnableMask = 0b11; 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;
} }