diff options
| author | Furquan Shaikh <furquan@chromium.org> | 2017-12-04 12:22:25 -0800 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2017-12-06 18:24:02 +0000 |
| commit | f3b97c5a7074d8734356cae9f9bbc4c2149dc5bf (patch) | |
| tree | 497501ef4d36d1a810e19423510870883d0359fa /src/mainboard/google | |
| parent | 7a835189b1ea94a878ff33afe15b3ee62e933a9e (diff) | |
mb/google/poppy: Introduce VARIANT_SPECIFIC_OPTIONS_*
In order to allow variants to select different Kconfig options, this
change adds VARIANT_SPECIFIC_OPTIONS_${VARIANT_NAME} which can be
selected by each variant in Kcnonfig.name.
Change-Id: I15db2fdac5c9e55f9698c8a0c083d6467afae245
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/22700
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/mainboard/google')
| -rw-r--r-- | src/mainboard/google/poppy/Kconfig | 24 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/Kconfig.name | 3 |
2 files changed, 21 insertions, 6 deletions
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index f725113fdc..d19cdbb7c5 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -3,12 +3,8 @@ config BOARD_GOOGLE_BASEBOARD_POPPY def_bool n select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_16384 - select DRIVERS_I2C_DA7219 if BOARD_GOOGLE_NAUTILUS select DRIVERS_I2C_GENERIC select DRIVERS_I2C_HID - select DRIVERS_I2C_MAX98927 if !BOARD_GOOGLE_NAUTILUS - select DRIVERS_PS2_KEYBOARD if BOARD_GOOGLE_NAUTILUS - select DRIVERS_SPI_ACPI select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_LPC @@ -16,8 +12,6 @@ config BOARD_GOOGLE_BASEBOARD_POPPY select HAVE_ACPI_TABLES select MAINBOARD_HAS_CHROMEOS select MAINBOARD_USES_FSP2_0 - select NO_FADT_8042 if !BOARD_GOOGLE_NAUTILUS - select POPPY_USE_I2C_TPM if !VBOOT_MOCK_SECDATA select SOC_INTEL_KABYLAKE if BOARD_GOOGLE_BASEBOARD_POPPY @@ -105,6 +99,24 @@ config VARIANT_DIR default "nautilus" if BOARD_GOOGLE_NAUTILUS default "soraka" if BOARD_GOOGLE_SORAKA +config VARIANT_SPECIFIC_OPTIONS_POPPY + def_bool n + select DRIVERS_I2C_MAX98927 + select NO_FADT_8042 + select POPPY_USE_I2C_TPM if !VBOOT_MOCK_SECDATA + +config VARIANT_SPECIFIC_OPTIONS_NAUTILUS + def_bool n + select DRIVERS_I2C_DA7219 + select DRIVERS_PS2_KEYBOARD + select POPPY_USE_I2C_TPM if !VBOOT_MOCK_SECDATA + +config VARIANT_SPECIFIC_OPTIONS_SORAKA + def_bool n + select DRIVERS_I2C_MAX98927 + select NO_FADT_8042 + select POPPY_USE_I2C_TPM if !VBOOT_MOCK_SECDATA + config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select HAS_RECOVERY_MRC_CACHE diff --git a/src/mainboard/google/poppy/Kconfig.name b/src/mainboard/google/poppy/Kconfig.name index ec4342bc43..e012928161 100644 --- a/src/mainboard/google/poppy/Kconfig.name +++ b/src/mainboard/google/poppy/Kconfig.name @@ -1,11 +1,14 @@ config BOARD_GOOGLE_POPPY bool "Poppy" select BOARD_GOOGLE_BASEBOARD_POPPY + select VARIANT_SPECIFIC_OPTIONS_POPPY config BOARD_GOOGLE_NAUTILUS bool "Nautilus" select BOARD_GOOGLE_BASEBOARD_POPPY + select VARIANT_SPECIFIC_OPTIONS_NAUTILUS config BOARD_GOOGLE_SORAKA bool "Soraka" select BOARD_GOOGLE_BASEBOARD_POPPY + select VARIANT_SPECIFIC_OPTIONS_SORAKA |