From 0b9cfe60b20b91fc172e041d192e48f4548572f5 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Tue, 26 Jun 2018 13:07:32 -0500 Subject: google/glados: Convert to variant setup Convert Skylake reference board glados to variant setup in preparation for merge with existing Skylake boards chell and lars, and upstreaming of new boards asuka, caroline, cave, and sentry. The following changes have been made: - move DPTF to variant subdir - move non-common EC defs to variant subdir - adjust Kconfig for variant setup - move non-common NHLT config to variant Kconfig - make non-common NHLT ACPI code conditional - move devicetree to variant subdir - move board GPIO defs to variant subdir - move board PEI data to variant subdir - move SPD index calculation to romstage so available for dual-channel determination during PEI for boards which need it - move SPD compilation to variant makefile - add weak function for determination of dual-channel RAM - add weak function for mainboard_gpio_smi_sleep() so SKL-Y variants can override and power down rails as needed Test: build google/glados Change-Id: I41615979dc11b5a10e32d6b5f477a256735cde53 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/27411 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/mainboard/google/glados/Kconfig | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'src/mainboard/google/glados/Kconfig') diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index 9a2e4ccf3c..5bed271a13 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -1,13 +1,11 @@ -if BOARD_GOOGLE_GLADOS - -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y +config BOARD_GOOGLE_BASEBOARD_GLADOS + def_bool n select BOARD_ROMSIZE_KB_16384 select DRIVERS_I2C_GENERIC select DRIVERS_I2C_NAU8825 select EC_GOOGLE_CHROMEEC - select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP + select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_PD @@ -21,6 +19,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOC_INTEL_SKYLAKE select SYSTEM_TYPE_LAPTOP +if BOARD_GOOGLE_BASEBOARD_GLADOS + config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_LID_SWITCH @@ -35,12 +35,20 @@ config MAINBOARD_DIR config MAINBOARD_PART_NUMBER string - default "Glados" + default "Glados" if BOARD_GOOGLE_GLADOS config MAINBOARD_FAMILY string default "Google_Glados" +config VARIANT_DIR + string + default "glados" if BOARD_GOOGLE_GLADOS + +config DEVICETREE + string + default "variants/glados/devicetree.cb" if BOARD_GOOGLE_GLADOS + config MAX_CPUS int default 8 @@ -52,20 +60,18 @@ config TPM_PIRQ config INCLUDE_NHLT_BLOBS bool "Include blobs for audio." select NHLT_DMIC_2CH - select NHLT_DMIC_4CH select NHLT_NAU88L25 - select NHLT_SSM4567 config EC_GOOGLE_CHROMEEC_BOARDNAME string - default "glados" + default "glados" if BOARD_GOOGLE_GLADOS config EC_GOOGLE_CHROMEEC_PD_BOARDNAME string - default "glados_pd" + default "glados_pd" if BOARD_GOOGLE_GLADOS config GBB_HWID string depends on CHROMEOS - default "GLADOS TEST 1988" + default "GLADOS TEST 1988" if BOARD_GOOGLE_GLADOS endif -- cgit v1.2.3