diff options
| author | Furquan Shaikh <furquan@chromium.org> | 2017-04-13 13:36:59 -0700 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2017-04-19 19:13:12 +0200 |
| commit | 3189ea6dd19c9a9df25af687cfaa014f37b68dd9 (patch) | |
| tree | 879ded875366338a07fed6a3e29d8ff611dd264e /src/mainboard/google/poppy | |
| parent | 54235ca1b765605be36a65cefabc958cde1c206a (diff) | |
mainboard/google/poppy: Prepare sharing directory for variants
Clean up Kconfig file in order to support variants for poppy. Add
BOARD_GOOGLE_BASEBOARD_POPPY that can be set by various poppy variants
to use the common baseboard configs.
BUG=b:37375693
Change-Id: I399ecc8c3efb3af26e1fcf60fe2c75b24769fc0f
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/19321
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/mainboard/google/poppy')
| -rw-r--r-- | src/mainboard/google/poppy/Kconfig | 46 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/Kconfig.name | 1 |
2 files changed, 25 insertions, 22 deletions
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index bc0c9cb483..e97df9b5ac 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -1,55 +1,54 @@ -if BOARD_GOOGLE_POPPY -config BOARD_SPECIFIC_OPTIONS - def_bool y +config BOARD_GOOGLE_BASEBOARD_POPPY + def_bool n select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_16384 select DRIVERS_INTEL_MIPI_CAMERA select DRIVERS_I2C_GENERIC select DRIVERS_I2C_HID + select DRIVERS_I2C_MAX98927 select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_LPC select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select MAINBOARD_HAS_CHROMEOS select MAINBOARD_USES_FSP2_0 - select DRIVERS_I2C_MAX98927 select NO_FADT_8042 select SOC_INTEL_KABYLAKE -config VBOOT - select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_LID_SWITCH +if BOARD_GOOGLE_BASEBOARD_POPPY + +config DRIVER_TPM_SPI_BUS + default 0x1 config GBB_HWID string depends on CHROMEOS - default "POPPY TEST 8294" + default "POPPY TEST 8294" if BOARD_GOOGLE_POPPY + +config INCLUDE_NHLT_BLOBS + bool "Include blobs for audio." + select NHLT_DMIC_2CH + select NHLT_DMIC_4CH + select NHLT_MAX98927 + select NHLT_RT5663 config MAINBOARD_DIR string default "google/poppy" -config MAINBOARD_PART_NUMBER +config MAINBOARD_FAMILY string - default "Poppy" + default "Google_Poppy" if BOARD_GOOGLE_POPPY -config MAINBOARD_FAMILY +config MAINBOARD_PART_NUMBER string - default "Google_Poppy" + default "Poppy" if BOARD_GOOGLE_POPPY config MAX_CPUS int default 8 -config INCLUDE_NHLT_BLOBS - bool "Include blobs for audio." - select NHLT_DMIC_2CH - select NHLT_DMIC_4CH - select NHLT_MAX98927 - select NHLT_RT5663 -endif - # Select this option to enable use of cr50 SPI TPM on poppy. # This option is disabled by default. config POPPY_USE_SPI_TPM @@ -60,5 +59,8 @@ config POPPY_USE_SPI_TPM select SPI_TPM select TPM2 -config DRIVER_TPM_SPI_BUS - default 0x1 +config VBOOT + select EC_GOOGLE_CHROMEEC_SWITCHES + select VBOOT_LID_SWITCH + +endif # BOARD_GOOGLE_BASEBOARD_POPPY diff --git a/src/mainboard/google/poppy/Kconfig.name b/src/mainboard/google/poppy/Kconfig.name index 745fd38560..b579ea8419 100644 --- a/src/mainboard/google/poppy/Kconfig.name +++ b/src/mainboard/google/poppy/Kconfig.name @@ -1,2 +1,3 @@ config BOARD_GOOGLE_POPPY bool "Poppy" + select BOARD_GOOGLE_BASEBOARD_POPPY |