mb/intel/coffeelake_rvp: Add support for new coffee lake RVP8

- Add new mainboard variant coffee lake RVP8, which is CRB for
  coffee lake-s processor, support U-DIMM DDR4 memory module.

- Modify cfl_h devicetree to enable IO devices, configure PCIE root
  port clock source, usb over current pin as per board schematics.

- Select cannonlake PCH-H chipset config for both cfl_h & cfl_s.

- Add GPIO table as per board schematics.

BUG= None
TEST= Build and flash, confirm boot into yocoto & windows OS on both
      cfl RVP11 & RVP8 platform. verified PCI, USB, ethernet, SATA,
      display, power functionalities.

Change-Id: Iabd32eb43ee8e6b1a3993ba4e083a80c62485b14
Signed-off-by: praveen hodagatta pranesh <praveenx.hodagatta.pranesh@intel.com>
Reviewed-on: https://review.coreboot.org/29066
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
praveen hodagatta pranesh 2018-09-28 22:31:49 +08:00 committed by Patrick Georgi
parent 92433c2878
commit da5491a626
5 changed files with 531 additions and 42 deletions

View File

@ -1,4 +1,4 @@
if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVPU || BOARD_INTEL_WHISKEYLAKE_RVP if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVPU || BOARD_INTEL_WHISKEYLAKE_RVP || BOARD_INTEL_COFFEELAKE_RVP8
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
@ -13,6 +13,7 @@ config BOARD_SPECIFIC_OPTIONS
select DRIVERS_I2C_GENERIC select DRIVERS_I2C_GENERIC
select SOC_INTEL_COFFEELAKE select SOC_INTEL_COFFEELAKE
select SOC_INTEL_CANNONLAKE_MEMCFG_INIT select SOC_INTEL_CANNONLAKE_MEMCFG_INIT
select SOC_INTEL_CANNONLAKE_PCH_H if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVP8
config MAINBOARD_DIR config MAINBOARD_DIR
string string
@ -23,6 +24,7 @@ config VARIANT_DIR
default "cfl_u" if BOARD_INTEL_COFFEELAKE_RVPU default "cfl_u" if BOARD_INTEL_COFFEELAKE_RVPU
default "cfl_h" if BOARD_INTEL_COFFEELAKE_RVP11 default "cfl_h" if BOARD_INTEL_COFFEELAKE_RVP11
default "whl_u" if BOARD_INTEL_WHISKEYLAKE_RVP default "whl_u" if BOARD_INTEL_WHISKEYLAKE_RVP
default "cfl_s" if BOARD_INTEL_COFFEELAKE_RVP8
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
string string
@ -38,6 +40,7 @@ config MAINBOARD_FAMILY
config MAX_CPUS config MAX_CPUS
int int
default 12 if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVP8
default 8 default 8
config DEVICETREE config DEVICETREE

View File

@ -6,3 +6,5 @@ config BOARD_INTEL_COFFEELAKE_RVP11
bool "-> Coffeelake H SO-DIMM DDR4 RVP11" bool "-> Coffeelake H SO-DIMM DDR4 RVP11"
config BOARD_INTEL_WHISKEYLAKE_RVP config BOARD_INTEL_WHISKEYLAKE_RVP
bool "-> Whiskeylake U DDR4 RVP" bool "-> Whiskeylake U DDR4 RVP"
config BOARD_INTEL_COFFEELAKE_RVP8
bool "-> Coffeelake S U-DIMM DDR4 RVP8"

View File

@ -17,6 +17,7 @@
#include <baseboard/variants.h> #include <baseboard/variants.h>
#include <commonlib/helpers.h> #include <commonlib/helpers.h>
#if !IS_ENABLED(CONFIG_SOC_INTEL_CANNONLAKE_PCH_H)
static const struct pad_config gpio_table[] = { static const struct pad_config gpio_table[] = {
/* GPPC */ /* GPPC */
/* A0 : RCINB_TIME_SYNC_1 */ /* A0 : RCINB_TIME_SYNC_1 */
@ -285,6 +286,310 @@ static const struct pad_config gpio_table[] = {
/* GPD_11 : LANPHYPC */ /* GPD_11 : LANPHYPC */
}; };
#else
static const struct pad_config gpio_table[] = {
/* GPPC */
/* A0 : RCIN_ESPI_ALERT1 */
/* A1 : ESPI_IO_0 */
/* A2 : ESPI_IO_1 */
/* A3 : ESPI_IO_2 */
/* A4 : ESPI_IO_3 */
/* A5 : ESPI_CSB */
/* A6 : SERIRQ */
/* A7 : PRIQAB_ESPI_ALERT0 */
/* A8 : CLKRUNB */
PAD_CFG_GPO(GPP_A8, 1, PLTRST),
/* A9 : CLKOUT_LPC_0_ESPI_CLK */
/* A10 : CLKOUT_LPC_1 */
/* A11 : I2S_CODEC_INT */
PAD_CFG_GPI_APIC_LOW(GPP_A11, UP_20K, PLTRST),
/* A12 : BM_BUSYB_ISH__GP_6 */
/* A13 : SUSWARNB_SUSPWRDNACK */
PAD_CFG_GPO(GPP_A13, 1, PLTRST),
/* A14 : SUS_STATB_ESPI_RESETB */
/* A15 : SUSACKB */
PAD_CFG_GPO(GPP_A15, 1, PLTRST),
/* A16 : TCH_PAD_INT_N */
PAD_CFG_GPI_APIC(GPP_A16, NONE, PLTRST, LEVEL, INVERT),
/* A17 : SD_VDD1_PWR_EN_B_ISH_GP_7 */
/* A18 : ISH_GP_0 */
/* A19 : ISH_GP_1 */
/* A20 : ISH_GP_2 */
/* A21 : ISH_GP_3 */
/* A22 : ISH_GP_4 */
/* A23 : ISH_GP_5 */
/* B0 : SPI_TPM_INIT */
PAD_CFG_GPI_SCI_LOW(GPP_B0, UP_20K, DEEP, EDGE_SINGLE),
/* B1 : GSPI1_CS1 */
/* B2 : VRALERTB */
PAD_CFG_GPI_APIC(GPP_B2, NONE, DEEP, LEVEL, NONE),
/* B3 : BT_RF_KILL */
PAD_CFG_GPO(GPP_B3, 1, DEEP),
/* B4 : WIFI_RF_KILL */
PAD_CFG_GPO(GPP_B4, 1, DEEP),
/* B5 : SRCCLKREQB_0 */
/* B6 : SRCCLKREQB_1 */
/* B7 : SRCCLKREQB_2 */
/* B8 : SRCCLKREQB_3 */
/* B9 : SRCCLKREQB_4 */
/* B10 : SRCCLKREQB_5 */
/* B11 : I2S_MCLK */
/* B12 : SLP_S0B */
/* B13 : PLTRSTB */
/* B14 : SPKR */
PAD_CFG_GPO(GPP_B14, 1, PLTRST),
/* B15 : GSPI0_CS0B */
PAD_CFG_GPO(GPP_B15, 0, DEEP),
/* B16 : GSPI0_CLK */
PAD_CFG_GPI_APIC(GPP_B16, NONE, PLTRST, LEVEL, NONE),
/* B17 : GSPI0_MISO */
PAD_CFG_GPO(GPP_B17, 1, PLTRST),
/* B18 : I2C_TCH_PNL_PWREN */
PAD_CFG_GPO(GPP_B18, 1, PLTRST),
/* B19 : GSPI1_CS0B */
/* B20 : GSPI1_CLK */
/* B21 : GSPI1_MISO */
/* B22 : GSP1_MOSI */
/* B23 : EC_SLP_S0_CS_N */
PAD_CFG_GPO(GPP_B23, 1, PLTRST),
/* C0 : SMBCLK */
/* C1 : SMBDATA */
/* C2 : SMBALERTB */
PAD_CFG_GPO(GPP_C2, 1, DEEP),
/* C3 : SML0CLK */
/* C4 : SML0DATA */
/* C5 : WIFI_WAKE_N */
PAD_CFG_GPI_SCI_LOW(GPP_C5, NONE, DEEP, LEVEL),
/* C6 : SML1CLK */
/* C7 : SML1DATA */
/* C8 : UART0_RXD */
PAD_CFG_GPI_APIC(GPP_C8, UP_20K, DEEP, LEVEL, INVERT),
/* C9 : UART0_TXD */
PAD_CFG_GPI_SCI_LOW(GPP_C9, UP_20K, PLTRST, EDGE_SINGLE),
/* C10 : UART0_RTSB */
PAD_CFG_GPO(GPP_C10, 0, PLTRST),
/* C11 : UART0_CTSB */
PAD_CFG_TERM_GPO(GPP_C11, 1, UP_20K, DEEP),
/* C12 : UART1_RXD_ISH_UART1_RXD */
PAD_CFG_GPO(GPP_C12, 1, PLTRST),
/* C13 : UART1_RXD_ISH_UART1_TXD */
/* C14 : SSD1_RESET */
PAD_CFG_GPO(GPP_C14, 1, PLTRST),
/* C15 : SSD2_RESET */
PAD_CFG_GPO(GPP_C15, 1, PLTRST),
/* C16 : I2C0_SDA */
/* C17 : I2C0_SCL */
/* C18 : I2C1_SDA */
/* C19 : I2C1_SCL */
/* C20 : UART2_RXD */
/* C21 : UART2_TXD */
/* C22 : UART2_RTSB */
/* C23 : UART2_CTSB */
/* D0 : SPI1_CSB_BK_0 */
/* D1 : SPI1_CLK_BK_1 */
/* D2 : SPI1_MISO_IO_1_BK_2 */
/* D3 : SPI1_MOSI_IO_0_BK_3 */
/* D4 : IMGCLKOUT_0_BK_4 */
/* D5 : ISH_I2C0_SDA */
/* D6 : ISH_I2C0_SCL */
/* D7 : SSP2_RXD */
PAD_CFG_GPI_INT(GPP_D7, NONE, PLTRST, LEVEL),
/* D8 : SSP2_SCLK */
PAD_CFG_GPI_INT(GPP_D8, NONE, PLTRST, LEVEL),
/* D9 : ISH_SPI_CSB */
PAD_CFG_GPO(GPP_D9, 1, PLTRST),
/* D10 : ISH_SPI_CLK */
PAD_CFG_GPI_APIC(GPP_D10, UP_20K, PLTRST, LEVEL, INVERT),
/* D11 : ISH_SPI_MISO_GP_BSSB_CLK */
PAD_CFG_GPI_SCI_LOW(GPP_D11, NONE, DEEP, LEVEL),
/* D12 : ISH_SPI_MOSI_GP_BSSB_DI */
/* D13 : ISH_UART0_RXD_SML0BDATA */
PAD_CFG_GPO(GPP_D13, 1, DEEP),
/* D14 : ISH_UART0_TXD_SML0BCLK */
PAD_CFG_GPO(GPP_D14, 1, PLTRST),
/* D15 : ISH_UART0_RTSB_GPSPI2_CS1B */
/* D16 : ISH_UART0_CTSB_SML0BALERTB */
PAD_CFG_GPI_SCI_HIGH(GPP_D16, NONE, DEEP, LEVEL),
/* D17 : DMIC_CLK_1_SNDW3_CLK */
/* D18 : DMIC_DATA_1_SNDW3_DATA */
/* D19 : DMIC_CLK_0_SNDW4_CLK */
/* D20 : DMIC_DATA_0_SNDW4_DATA */
/* D21 : SPI1_IO_2 */
PAD_CFG_NF(GPP_D21, NONE, PLTRST, NF1),
/* D22 : SPI1_IO_3 */
PAD_CFG_NF(GPP_D22, NONE, PLTRST, NF1),
/* D23 : ISH_I2C2_SCL_I2C3_SCL */
/* E0 : SATAXPCIE_0_SATAGP_0 */
/* E1 : SATAXPCIE_1_SATAGP_1 */
/* E2 : SATAXPCIE_2_SATAGP_2 */
PAD_CFG_GPI(GPP_E2, UP_20K, PLTRST),
/* E3 : EC_SMI_N */
PAD_CFG_GPI_SMI(GPP_E3, NONE, PLTRST, EDGE_SINGLE, NONE),
/* E4 : SATA_DEVSLP_0 */
PAD_CFG_NF(GPP_E4, NONE, DEEP, NF1),
/* E5 : SATA_DEVSLP_1 */
/* E6 : SATA_DEVSLP_2 */
PAD_CFG_GPI_SCI(GPP_E6, NONE, DEEP, OFF, NONE),
/* E7 : CPU_GP_1 */
PAD_CFG_GPI_INT(GPP_E7, NONE, PLTRST, EDGE_SINGLE),
/* E8 : SATA_LEDB */
/* E9 : USB2_OCB_0 */
/* E10 : USB2_OCB_1 */
/* E11 : USB2_OCB_2 */
/* E12 : USB2_OCB_3 */
/* F0 : SATAXPCIE_3_SATAGP_3 */
/* F1 : SATAXPCIE_4_SATAGP_4 */
/* F2 : SATAXPCIE_5_SATAGP_5 */
/* F3 : SATAXPCIE_6_SATAGP_6 */
/* F4 : SLOT2_RST_N */
PAD_CFG_GPO(GPP_F4, 1, PLTRST),
/* F5 : SATA_DEVSLP_3 */
/* F6 : SATA_DEVSLP_4 */
/* F7 : ME_PG_LED */
PAD_CFG_GPI_INT(GPP_F7, NONE, PLTRST, LEVEL),
/* F8 : SATA_DEVSLP_6 */
/* F9 : PEG_SLOT_RST */
PAD_CFG_GPO(GPP_F9, 1, PLTRST),
/* F10 : BIOS_RECOVERY */
PAD_CFG_GPI_INT(GPP_F10, NONE, PLTRST, LEVEL),
/* F11 : SATA_SLOAD */
/* F12 : SATA_S-DATA_OUT1 */
/* F13 : SATA_S-DATA_OUT0 */
/* F14 : PS_ON */
/* F15 : USB2_OC_4 */
/* F16 : USB2_OC_5 */
/* F17 : USB2_OC_6 */
/* F18 : USB2_OC_7 */
/* F19 : EDP_VDDEN */
/* F20 : EDP_BKLTEN */
/* F21 : EDP_BKLTCTL */
/* F22 : DDPF_C_TRLCLK */
/* F23 : DDPF_C_TRLDATA */
/* G0 : SD_DATA */
/* G1 : SD_DATA0 */
/* G2 : SD_DATA1 */
/* G3 : SD_DATA2 */
/* G4 : SD_DATA3 */
/* G5 : GPP_G_5_SD3_CDB */
PAD_CFG_NF(GPP_G5, UP_20K, DEEP, GPIO),
/* G6 : SD_CLK */
/* G7 : GPP_G_7_SD3_WP */
PAD_CFG_NF(GPP_G7, UP_20K, DEEP, GPIO),
/* H0 : SRCCLKREQB_6 */
/* H1 : SRCCLKREQB_7 */
/* H2 : SRCCLKREQB_8 */
/* H3 : SRCCLKREQB_9 */
/* H4 : SRCCLKREQB_10 */
/* H5 : SRCCLKREQB_11 */
/* H6 : SRCCLKREQB_12 */
/* H7 : SRCCLKREQB_13 */
/* H8 : SRCCLKREQB_14 */
/* H9 : SRCCLKREQB_15 */
/* H10 : Audio Power Enable */
PAD_CFG_GPO(GPP_H10, 1, PLTRST),
/* H11 : SML_2_DATA */
/* H12 : SML_2_ALERT */
/* H13 : SML_3_CLK */
/* H14 : SML_3_DATA */
/* H15 : SML_3_ALERT */
/* H16 : TBT_CIO_PWREN */
PAD_CFG_GPO(GPP_H16, 1, PLTRST),
/* H17 : TBT_FORCE_PWR */
PAD_CFG_GPO(GPP_H17, 0, PLTRST),
/* H18 : SML_4_ALERT */
/* H19 : ISH_I2C0_SDA */
/* H20 : ISH_I2C0_SCL */
/* H21 : ISH_I2C1_SDA */
/* H22 : ISH_I2C1_SCL */
/* H23 : TBT_CIO_PLUG_EVENT_N */
PAD_CFG_GPI_SCI_LOW(GPP_H23, NONE, PLTRST, EDGE_SINGLE),
/* I0 : DDPB_HPD_0 */
/* I1 : DDPC_HPD_1 */
/* I2 : DPPD_HPD_2 */
/* I3 : DPPE_HPD_3 */
/* I4 : EDP_HPD */
/* I5 : DDPB_C_TRLCLK */
/* I6 : DDPB_C_TRLDATA */
/* I7 : DDPC_C_TRLCLK */
/* I8 : DDPC_C_TRLDATA */
/* I9 : DDPD_C_TRLCLK */
/* I10 : DDPD_C_TRLDATA */
/* I11 : M2_SKT2_C_FG0 */
/* I12 : M2_SKT2_CFG1 */
/* I13 : M2_SKT2_C_FG2 */
/* I14 : M2_SKT2_C_FG3 */
/* J0 : I2C_TCH_PNL_INT */
PAD_CFG_GPI_APIC(GPP_J0, UP_20K, PLTRST, EDGE_SINGLE, INVERT),
/* J1 : CPU_C10_GATE */
/* J2 : FPS_INT_N */
PAD_CFG_GPI_APIC(GPP_J2, NONE, PLTRST, EDGE_SINGLE, NONE),
/* J3 : FPS_RST_N */
PAD_CFG_GPO(GPP_J3, 1, PLTRST),
/* J4 : CNV_BRI_DT_UART0_RTS */
/* J5 : CNV_BRI_RSP_UART0_RXD */
/* J6 : CNV_RGI_DT_UART0_TXD */
/* J7 : CNV_RGI_RSP_UART0_CTS */
/* J8 : CNV_M_FUART2_RXD */
/* J9 : CNV_M_FUART2_TXD */
/* J10 : I2C_TCH_PNL_RST_N */
PAD_CFG_GPO(GPP_J10, 1, PLTRST),
/* J11 : SPEAKER_PD */
PAD_CFG_GPO(GPP_J11, 1, PLTRST),
/* K0 : GPP_K0 */
/* K1 : SATA_ODD_PWRGT_R */
PAD_CFG_GPO(GPP_K1, 1, PLTRST),
/* K2 : SATA_ODD_DA_N */
PAD_CFG_GPI_SCI_HIGH(GPP_K2, NONE, PLTRST, EDGE_SINGLE),
/* K3 : GPP_K3 */
/* K4 : GPP_K4 */
/* K5 : GPP_K5 */
/* K6 : GPP_K6 */
/* K7 : GPP_K7 */
/* K8 : GPP_K8 */
/* K9 : GPP_K9 */
/* K10 : GPP_K10 */
/* K11 : RUNTIME_SCI */
PAD_CFG_GPI_SCI_LOW(GPP_K11, UP_20K, PLTRST, LEVEL),
/* K12 : GSXDOUT */
/* K13 : GSXSLOAD */
/* K14 : GSXDIN */
/* K15 : GSXSRESET */
/* K16 : GSXCLK */
/* K17 : ADR_COMPLETE */
/* K18 : SLOT2_WAKE_N */
PAD_CFG_GPI_SCI_LOW(GPP_K18, NONE, PLTRST, LEVEL),
/* K19 : SMI */
/* K20 : GPP_K20 */
/* K21 : GPP_K21 */
/* K22 : IMGCLKOUT_0 */
/* K23 : IMGCLKOUT_1 */
/* GPD */
/* GPD_0 : BATLOWB */
/* GPD_1 : ACPRESENT */
/* GPD_2 : LAN_WAKEB */
/* GPD_3 : PWRBTNB */
/* GPD_4 : SLP_S3B */
/* GPD_5 : SLP_S4B */
/* GPD_6 : SLP_AB */
/* GPD_7 : GPD_7 */
/* GPD-8 : SUSCLK */
/* GPD-9 : SLP_WLANB */
/* GPD-10 : SLP_5B */
/* GPD_11 : LANPHYPC */
};
#endif
/* Early pad configuration in bootblock */ /* Early pad configuration in bootblock */
static const struct pad_config early_gpio_table[] = { static const struct pad_config early_gpio_table[] = {

View File

@ -6,31 +6,48 @@ chip soc/intel/cannonlake
# FSP configuration # FSP configuration
register "SaGv" = "3" register "SaGv" = "3"
register "RMT" = "1"
register "SmbusEnable" = "1" register "SmbusEnable" = "1"
register "ScsEmmcHs400Enabled" = "1" register "ScsEmmcHs400Enabled" = "1"
register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC0)" register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC5)"
register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC0)" register "usb2_ports[1]" = "USB2_PORT_MID(OC6)"
register "usb2_ports[2]" = "USB2_PORT_MID(OC0)" register "usb2_ports[2]" = "USB2_PORT_MID(OC4)"
register "usb2_ports[3]" = "USB2_PORT_MID(OC0)" register "usb2_ports[3]" = "USB2_PORT_MID(OC4)"
register "usb2_ports[4]" = "USB2_PORT_MID(OC0)" register "usb2_ports[4]" = "USB2_PORT_MID(OC0)"
register "usb2_ports[5]" = "USB2_PORT_MID(OC0)" register "usb2_ports[5]" = "USB2_PORT_MID(OC0)"
register "usb2_ports[6]" = "USB2_PORT_EMPTY" register "usb2_ports[6]" = "USB2_PORT_MID(OC1)"
register "usb2_ports[7]" = "USB2_PORT_EMPTY" register "usb2_ports[7]" = "USB2_PORT_MID(OC1)"
register "usb2_ports[8]" = "USB2_PORT_EMPTY" register "usb2_ports[8]" = "USB2_PORT_MID(OC2)"
register "usb2_ports[9]" = "USB2_PORT_MID(OC0)" register "usb2_ports[9]" = "USB2_PORT_MID(OC7)"
register "usb2_ports[10]" = "USB2_PORT_MID(OC7)"
register "usb2_ports[11]" = "USB2_PORT_MID(OC3)"
register "usb2_ports[12]" = "USB2_PORT_MID(OC3)"
register "usb2_ports[13]" = "USB2_PORT_MID(OC_SKIP)"
register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC0)" register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC5)"
register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC0)" register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC7)"
register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC0)" register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC4)"
register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC0)" register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC4)"
register "usb3_ports[4]" = "USB3_PORT_DEFAULT(OC0)" register "usb3_ports[4]" = "USB3_PORT_DEFAULT(OC0)"
register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC0)" register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC0)"
register "usb3_ports[6]" = "USB3_PORT_DEFAULT(OC1)"
register "usb3_ports[7]" = "USB3_PORT_DEFAULT(OC1)"
register "usb3_ports[8]" = "USB3_PORT_DEFAULT(OC2)"
register "usb3_ports[9]" = "USB3_PORT_DEFAULT(OC7)"
register "PchHdaDspEnable" = "1" register "SataSalpSupport" = "1"
register "SataPortsEnable[0]" = "1"
register "SataPortsEnable[1]" = "1"
register "SataPortsEnable[2]" = "1"
register "SataPortsEnable[3]" = "1"
register "SataPortsEnable[4]" = "1"
register "SataPortsEnable[5]" = "1"
register "SataPortsEnable[6]" = "1"
register "SataPortsEnable[7]" = "1"
register "PchHdaDspEnable" = "0"
register "PchHdaAudioLinkHda" = "1" register "PchHdaAudioLinkHda" = "1"
register "PchHdaAudioLinkSsp0" = "1"
register "PchHdaAudioLinkSsp1" = "1"
register "PcieRpEnable[0]" = "1" register "PcieRpEnable[0]" = "1"
register "PcieRpEnable[1]" = "1" register "PcieRpEnable[1]" = "1"
@ -46,13 +63,25 @@ chip soc/intel/cannonlake
register "PcieRpEnable[11]" = "1" register "PcieRpEnable[11]" = "1"
register "PcieRpEnable[12]" = "1" register "PcieRpEnable[12]" = "1"
register "PcieRpEnable[13]" = "1" register "PcieRpEnable[13]" = "1"
register "PcieRpEnable[14]" = "1"
register "PcieRpEnable[15]" = "1"
register "PcieRpEnable[16]" = "1"
register "PcieRpEnable[17]" = "1"
register "PcieRpEnable[18]" = "1"
register "PcieRpEnable[19]" = "1"
register "PcieRpEnable[20]" = "1"
register "PcieRpEnable[21]" = "1"
register "PcieRpEnable[22]" = "1"
register "PcieRpEnable[23]" = "1"
register "PcieClkSrcUsage[0]" = "PCIE_CLK_NOTUSED" register "PcieClkSrcUsage[0]" = "1"
register "PcieClkSrcUsage[1]" = "8" register "PcieClkSrcUsage[1]" = "8"
register "PcieClkSrcUsage[2]" = "PCIE_CLK_LAN" register "PcieClkSrcUsage[2]" = "PCIE_CLK_NOTUSED"
register "PcieClkSrcUsage[3]" = "14" register "PcieClkSrcUsage[3]" = "0x6"
register "PcieClkSrcUsage[4]" = "PCIE_CLK_NOTUSED" register "PcieClkSrcUsage[4]" = "0x18"
register "PcieClkSrcUsage[5]" = "1" register "PcieClkSrcUsage[5]" = "14"
register "PcieClkSrcUsage[8]" = "0x40"
register "PcieClkSrcUsage[9]" = "PCIE_CLK_LAN"
register "PcieClkSrcClkReq[0]" = "0" register "PcieClkSrcClkReq[0]" = "0"
register "PcieClkSrcClkReq[1]" = "1" register "PcieClkSrcClkReq[1]" = "1"
@ -60,15 +89,14 @@ chip soc/intel/cannonlake
register "PcieClkSrcClkReq[3]" = "3" register "PcieClkSrcClkReq[3]" = "3"
register "PcieClkSrcClkReq[4]" = "4" register "PcieClkSrcClkReq[4]" = "4"
register "PcieClkSrcClkReq[5]" = "5" register "PcieClkSrcClkReq[5]" = "5"
register "PcieClkSrcClkReq[8]" = "8"
register "PcieClkSrcClkReq[9]" = "9"
# Enable "Intel Speed Shift Technology" # Enable "Intel Speed Shift Technology"
register "speed_shift_enable" = "1" register "speed_shift_enable" = "1"
# GPIO for SD card detect # HECI
register "sdcard_cd_gpio" = "GPP_G5" register "HeciEnabled" = "1"
# Enable S0ix
register "s0ix_enable" = "1"
device domain 0 on device domain 0 on
device pci 00.0 on end # Host Bridge device pci 00.0 on end # Host Bridge
@ -79,29 +107,19 @@ chip soc/intel/cannonlake
device pci 12.6 off end # GSPI #2 device pci 12.6 off end # GSPI #2
device pci 14.0 on end # USB xHCI device pci 14.0 on end # USB xHCI
device pci 14.1 off end # USB xDCI (OTG) device pci 14.1 off end # USB xDCI (OTG)
device pci 14.3 on end # CNVi wifi
device pci 14.5 on end # SDCard device pci 14.5 on end # SDCard
device pci 15.0 on device pci 15.0 on end # I2C #0
chip drivers/i2c/hid
register "generic.hid" = ""ALPS0001""
register "generic.desc" = ""Touchpad""
register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_B3_IRQ)"
register "hid_desc_reg_offset" = "0x1"
device i2c 2C on end
end
end # I2C 0
device pci 15.1 on end # I2C #1 device pci 15.1 on end # I2C #1
device pci 15.2 off end # I2C #2 device pci 15.2 off end # I2C #2
device pci 15.3 on end # I2C #3 device pci 15.3 off end # I2C #3
device pci 16.0 on end # Management Engine Interface 1 device pci 16.0 on end # Management Engine Interface 1
device pci 16.1 off end # Management Engine Interface 2 device pci 16.1 off end # Management Engine Interface 2
device pci 16.2 off end # Management Engine IDE-R device pci 16.2 off end # Management Engine IDE-R
device pci 16.3 off end # Management Engine KT Redirection device pci 16.3 off end # Management Engine KT Redirection
device pci 16.4 off end # Management Engine Interface 3 device pci 16.4 off end # Management Engine Interface 3
device pci 16.5 off end # Management Engine Interface 4 device pci 16.5 off end # Management Engine Interface 4
device pci 17.0 off end # SATA device pci 17.0 on end # SATA
device pci 19.0 on end # I2C #4 device pci 19.0 off end # I2C #4
device pci 19.1 off end # I2C #5
device pci 19.2 on end # UART #2 device pci 19.2 on end # UART #2
device pci 1a.0 on end # eMMC device pci 1a.0 on end # eMMC
device pci 1c.0 on end # PCI Express Port 1 x4 SLOT1 device pci 1c.0 on end # PCI Express Port 1 x4 SLOT1
@ -128,9 +146,9 @@ chip soc/intel/cannonlake
end # LPC Interface end # LPC Interface
device pci 1f.1 on end # P2SB device pci 1f.1 on end # P2SB
device pci 1f.2 on end # Power Management Controller device pci 1f.2 on end # Power Management Controller
device pci 1f.3 off end # Intel HDA device pci 1f.3 on end # Intel HDA
device pci 1f.4 on end # SMBus device pci 1f.4 on end # SMBus
device pci 1f.5 on end # PCH SPI device pci 1f.5 on end # PCH SPI
device pci 1f.6 off end # GbE device pci 1f.6 on end # GbE
end end
end end

View File

@ -0,0 +1,161 @@
chip soc/intel/cannonlake
device cpu_cluster 0 on
device lapic 0 on end
end
# FSP configuration
register "SaGv" = "3"
register "RMT" = "1"
register "SmbusEnable" = "1"
register "ScsEmmcHs400Enabled" = "1"
register "usb2_ports[0]" = "USB2_PORT_TYPE_C(OC4)"
register "usb2_ports[1]" = "USB2_PORT_TYPE_C(OC0)"
register "usb2_ports[2]" = "USB2_PORT_MID(OC2)"
register "usb2_ports[3]" = "USB2_PORT_MID(OC5)"
register "usb2_ports[4]" = "USB2_PORT_MID(OC5)"
register "usb2_ports[5]" = "USB2_PORT_MID(OC0)"
register "usb2_ports[6]" = "USB2_PORT_MID(OC1)"
register "usb2_ports[7]" = "USB2_PORT_MID(OC1)"
register "usb2_ports[8]" = "USB2_PORT_EMPTY"
register "usb2_ports[9]" = "USB2_PORT_MID(OC3)"
register "usb2_ports[10]" = "USB2_PORT_MID(OC3)"
register "usb2_ports[11]" = "USB2_PORT_MID(OC6)"
register "usb2_ports[12]" = "USB2_PORT_MID(OC6)"
register "usb2_ports[13]" = "USB2_PORT_EMPTY"
register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC4)"
register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC0)"
register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC2)"
register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC5)"
register "usb3_ports[4]" = "USB3_PORT_DEFAULT(OC5)"
register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC0)"
register "usb3_ports[6]" = "USB3_PORT_DEFAULT(OC1)"
register "usb3_ports[7]" = "USB3_PORT_DEFAULT(OC1)"
register "usb3_ports[8]" = "USB3_PORT_DEFAULT(OC_SKIP)"
register "usb3_ports[9]" = "USB3_PORT_DEFAULT(OC3)"
register "SataSalpSupport" = "1"
register "SataPortsEnable[0]" = "1"
register "SataPortsEnable[1]" = "1"
register "SataPortsEnable[2]" = "1"
register "SataPortsEnable[3]" = "1"
register "SataPortsEnable[4]" = "1"
register "SataPortsEnable[5]" = "1"
register "SataPortsEnable[6]" = "1"
register "SataPortsEnable[7]" = "1"
register "PchHdaDspEnable" = "0"
register "PchHdaAudioLinkHda" = "1"
register "PcieRpEnable[0]" = "1"
register "PcieRpEnable[1]" = "1"
register "PcieRpEnable[2]" = "1"
register "PcieRpEnable[3]" = "1"
register "PcieRpEnable[4]" = "1"
register "PcieRpEnable[5]" = "1"
register "PcieRpEnable[6]" = "1"
register "PcieRpEnable[7]" = "1"
register "PcieRpEnable[8]" = "1"
register "PcieRpEnable[9]" = "1"
register "PcieRpEnable[10]" = "1"
register "PcieRpEnable[11]" = "1"
register "PcieRpEnable[12]" = "1"
register "PcieRpEnable[13]" = "1"
register "PcieRpEnable[14]" = "1"
register "PcieRpEnable[15]" = "1"
register "PcieRpEnable[16]" = "1"
register "PcieRpEnable[17]" = "1"
register "PcieRpEnable[18]" = "1"
register "PcieRpEnable[19]" = "1"
register "PcieRpEnable[20]" = "1"
register "PcieRpEnable[21]" = "1"
register "PcieRpEnable[22]" = "1"
register "PcieRpEnable[23]" = "1"
register "PcieClkSrcUsage[0]" = "PCIE_CLK_NOTUSED"
register "PcieClkSrcUsage[1]" = "8"
register "PcieClkSrcUsage[2]" = "PCIE_CLK_LAN"
register "PcieClkSrcUsage[3]" = "0x6"
register "PcieClkSrcUsage[4]" = "0x18"
register "PcieClkSrcUsage[5]" = "1"
register "PcieClkSrcUsage[6]" = "0x8"
register "PcieClkSrcUsage[8]" = "0x40"
register "PcieClkSrcUsage[9]" = "PCIE_CLK_NOTUSED"
register "PcieClkSrcUsage[10]" = "0x14"
register "PcieClkSrcClkReq[0]" = "0"
register "PcieClkSrcClkReq[1]" = "1"
register "PcieClkSrcClkReq[2]" = "2"
register "PcieClkSrcClkReq[3]" = "3"
register "PcieClkSrcClkReq[4]" = "4"
register "PcieClkSrcClkReq[5]" = "5"
register "PcieClkSrcClkReq[6]" = "6"
register "PcieClkSrcClkReq[8]" = "8"
register "PcieClkSrcClkReq[9]" = "9"
register "PcieClkSrcClkReq[10]" = "10"
# Enable "Intel Speed Shift Technology"
register "speed_shift_enable" = "1"
# HECI
register "HeciEnabled" = "1"
device domain 0 on
device pci 00.0 on end # Host Bridge
device pci 02.0 on end # Integrated Graphics Device
device pci 04.0 on end # SA Thermal device
device pci 12.0 on end # Thermal Subsystem
device pci 12.5 off end # UFS SCS
device pci 12.6 off end # GSPI #2
device pci 14.0 on end # USB xHCI
device pci 14.1 off end # USB xDCI (OTG)
device pci 14.3 on end # CNVi wifi
device pci 14.5 on end # SDCard
device pci 15.0 on end # I2C 0
device pci 15.1 on end # I2C #1
device pci 15.2 on end # I2C #2
device pci 15.3 on end # I2C #3
device pci 16.0 on end # Management Engine Interface 1
device pci 16.1 off end # Management Engine Interface 2
device pci 16.2 off end # Management Engine IDE-R
device pci 16.3 off end # Management Engine KT Redirection
device pci 16.4 off end # Management Engine Interface 3
device pci 16.5 off end # Management Engine Interface 4
device pci 17.0 on end # SATA
device pci 19.0 off end # I2C #4
device pci 19.2 on end # UART #2
device pci 1a.0 on end # eMMC
device pci 1c.0 on end # PCI Express Port 1
device pci 1c.4 on end # PCI Express Port 5
device pci 1c.5 off end # PCI Express Port 6
device pci 1c.6 off end # PCI Express Port 7
device pci 1c.7 off end # PCI Express Port 8
device pci 1d.0 on end # PCI Express Port 9 X4 SLOT 1
device pci 1d.1 off end # PCI Express Port 10
device pci 1d.2 off end # PCI Express Port 11
device pci 1d.3 off end # PCI Express Port 12
device pci 1d.4 off end # PCI Express Port 13
device pci 1d.5 off end # PCI Express Port 14
device pci 1d.6 off end # PCI Express Port 15
device pci 1d.7 off end # PCI Express Port 16
device pci 1b.0 on end # PCI Express Port 17
device pci 1b.4 on end # PCI Express Port 21 X4 SLOT 2
device pci 1e.0 on end # UART #0
device pci 1e.1 off end # UART #1
device pci 1e.2 off end # GSPI #0
device pci 1e.3 off end # GSPI #1
device pci 1f.0 on
chip drivers/pc80/tpm
device pnp 0c31.0 on end
end
end # LPC Interface
device pci 1f.1 on end # P2SB
device pci 1f.2 on end # Power Management Controller
device pci 1f.3 on end # Intel HDA
device pci 1f.4 on end # SMBus
device pci 1f.5 on end # PCH SPI
device pci 1f.6 on end # GbE
end
end