summaryrefslogtreecommitdiff
path: root/src/mainboard/google/poppy
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2021-12-17 05:56:21 +0100
committerFelix Singer <felixsinger@posteo.net>2021-12-20 22:06:51 +0000
commit01c06d7ba529ebd7effdd219d578315911275a6b (patch)
tree0c1109c7f22130e2f447e288f1824c8038d8ee2f /src/mainboard/google/poppy
parentae69f518b672c648ee46863f2cd6b4358ee69c66 (diff)
mb/google/poppy: Drop unnecessary Kconfig options
These variant-specific options are only selected by their board options and are not used for anything else. Thus, merge their selects into the board options and drop them. Change-Id: I0eb3fdc4fd7306e76d5479494e3ab80bbdb984fe Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/60189 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Diffstat (limited to 'src/mainboard/google/poppy')
-rw-r--r--src/mainboard/google/poppy/Kconfig136
1 files changed, 54 insertions, 82 deletions
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index dce2ecc4cf..b938ed75c2 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -19,31 +19,78 @@ config BOARD_GOOGLE_BASEBOARD_POPPY
config BOARD_GOOGLE_ATLAS
select BOARD_GOOGLE_BASEBOARD_POPPY
- select VARIANT_SPECIFIC_OPTIONS_ATLAS
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_I2C_DA7219
+ select DRIVERS_I2C_MAX98373
+ select DRIVERS_SPI_ACPI
+ select DRIVERS_USB_ACPI
+ select EXCLUDE_NATIVE_SD_INTERFACE
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+ select MAINBOARD_HAS_LIBGFXINIT
+ select MAINBOARD_HAS_SPI_TPM_CR50
+ select SYSTEM_TYPE_LAPTOP
+ select VARIANT_HAS_CAMERA_ACPI
config BOARD_GOOGLE_POPPY
select BOARD_GOOGLE_BASEBOARD_POPPY
- select VARIANT_SPECIFIC_OPTIONS_POPPY
+ select DRIVERS_I2C_MAX98927
+ select MAINBOARD_HAS_I2C_TPM_CR50
+ select NO_FADT_8042
+ select SYSTEM_TYPE_LAPTOP
+ select VARIANT_HAS_CAMERA_ACPI
config BOARD_GOOGLE_NAMI
select BOARD_GOOGLE_BASEBOARD_POPPY
- select VARIANT_SPECIFIC_OPTIONS_NAMI
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENERIC_MAX98357A
+ select DRIVERS_I2C_DA7219
+ select DRIVERS_SPI_ACPI
+ select EXCLUDE_NATIVE_SD_INTERFACE
+ select MAINBOARD_HAS_SPI_TPM_CR50
+ select SYSTEM_TYPE_LAPTOP
config BOARD_GOOGLE_NAUTILUS
select BOARD_GOOGLE_BASEBOARD_POPPY
- select VARIANT_SPECIFIC_OPTIONS_NAUTILUS
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENERIC_MAX98357A
+ select DRIVERS_I2C_DA7219
+ select MAINBOARD_HAS_I2C_TPM_CR50
+ select SYSTEM_TYPE_CONVERTIBLE
+ select VARIANT_HAS_CAMERA_ACPI
config BOARD_GOOGLE_NOCTURNE
select BOARD_GOOGLE_BASEBOARD_POPPY
- select VARIANT_SPECIFIC_OPTIONS_NOCTURNE
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_I2C_DA7219
+ select DRIVERS_I2C_MAX98373
+ select DRIVERS_I2C_SX9310
+ select DRIVERS_SPI_ACPI
+ select DRIVERS_USB_ACPI
+ select EXCLUDE_NATIVE_SD_INTERFACE
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+ select MAINBOARD_HAS_SPI_TPM_CR50
+ select NO_FADT_8042
+ select SYSTEM_TYPE_DETACHABLE
+ select VARIANT_HAS_CAMERA_ACPI
config BOARD_GOOGLE_RAMMUS
select BOARD_GOOGLE_BASEBOARD_POPPY
- select VARIANT_SPECIFIC_OPTIONS_RAMMUS
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_I2C_DA7219
+ select DRIVERS_I2C_MAX98927
+ select DRIVERS_SPI_ACPI
+ select DRIVERS_USB_ACPI
+ select MAINBOARD_HAS_LIBGFXINIT
+ select MAINBOARD_HAS_SPI_TPM_CR50
+ select SYSTEM_TYPE_LAPTOP
config BOARD_GOOGLE_SORAKA
select BOARD_GOOGLE_BASEBOARD_POPPY
- select VARIANT_SPECIFIC_OPTIONS_SORAKA
+ select DRIVERS_I2C_MAX98927
+ select MAINBOARD_HAS_I2C_TPM_CR50
+ select NO_FADT_8042
+ select SYSTEM_TYPE_DETACHABLE
+ select VARIANT_HAS_CAMERA_ACPI
if BOARD_GOOGLE_BASEBOARD_POPPY
@@ -155,81 +202,6 @@ config VARIANT_HAS_CAMERA_ACPI
bool
default n
-config VARIANT_SPECIFIC_OPTIONS_ATLAS
- def_bool n
- select CHROMEOS_WIFI_SAR if CHROMEOS
- select DRIVERS_I2C_DA7219
- select DRIVERS_I2C_MAX98373
- select DRIVERS_SPI_ACPI
- select DRIVERS_USB_ACPI
- select EXCLUDE_NATIVE_SD_INTERFACE
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
- select MAINBOARD_HAS_LIBGFXINIT
- select MAINBOARD_HAS_SPI_TPM_CR50
- select SYSTEM_TYPE_LAPTOP
- select VARIANT_HAS_CAMERA_ACPI
-
-config VARIANT_SPECIFIC_OPTIONS_POPPY
- def_bool n
- select DRIVERS_I2C_MAX98927
- select MAINBOARD_HAS_I2C_TPM_CR50
- select NO_FADT_8042
- select SYSTEM_TYPE_LAPTOP
- select VARIANT_HAS_CAMERA_ACPI
-
-config VARIANT_SPECIFIC_OPTIONS_NAMI
- def_bool n
- select CHROMEOS_WIFI_SAR if CHROMEOS
- select DRIVERS_GENERIC_MAX98357A
- select DRIVERS_I2C_DA7219
- select DRIVERS_SPI_ACPI
- select EXCLUDE_NATIVE_SD_INTERFACE
- select MAINBOARD_HAS_SPI_TPM_CR50
- select SYSTEM_TYPE_LAPTOP
-
-config VARIANT_SPECIFIC_OPTIONS_NAUTILUS
- def_bool n
- select CHROMEOS_WIFI_SAR if CHROMEOS
- select DRIVERS_GENERIC_MAX98357A
- select DRIVERS_I2C_DA7219
- select MAINBOARD_HAS_I2C_TPM_CR50
- select SYSTEM_TYPE_CONVERTIBLE
- select VARIANT_HAS_CAMERA_ACPI
-
-config VARIANT_SPECIFIC_OPTIONS_NOCTURNE
- def_bool n
- select CHROMEOS_WIFI_SAR if CHROMEOS
- select DRIVERS_I2C_DA7219
- select DRIVERS_I2C_MAX98373
- select DRIVERS_I2C_SX9310
- select DRIVERS_SPI_ACPI
- select DRIVERS_USB_ACPI
- select EXCLUDE_NATIVE_SD_INTERFACE
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
- select MAINBOARD_HAS_SPI_TPM_CR50
- select NO_FADT_8042
- select SYSTEM_TYPE_DETACHABLE
- select VARIANT_HAS_CAMERA_ACPI
-
-config VARIANT_SPECIFIC_OPTIONS_RAMMUS
- def_bool n
- select CHROMEOS_WIFI_SAR if CHROMEOS
- select DRIVERS_I2C_DA7219
- select DRIVERS_I2C_MAX98927
- select DRIVERS_SPI_ACPI
- select DRIVERS_USB_ACPI
- select MAINBOARD_HAS_LIBGFXINIT
- select MAINBOARD_HAS_SPI_TPM_CR50
- select SYSTEM_TYPE_LAPTOP
-
-config VARIANT_SPECIFIC_OPTIONS_SORAKA
- def_bool n
- select DRIVERS_I2C_MAX98927
- select MAINBOARD_HAS_I2C_TPM_CR50
- select NO_FADT_8042
- select SYSTEM_TYPE_DETACHABLE
- select VARIANT_HAS_CAMERA_ACPI
-
config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES
select HAS_RECOVERY_MRC_CACHE