Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60145 )
Change subject: mb/google/poppy/Kconfig: Reuse option names from Kconfig.names ......................................................................
mb/google/poppy/Kconfig: Reuse option names from Kconfig.names
Change-Id: Ib0e6b055f206a71da57e19d3c2b0a54d8187b1e9 Signed-off-by: Felix Singer felixsinger@posteo.net --- M src/mainboard/google/poppy/Kconfig M src/mainboard/google/poppy/Kconfig.name 2 files changed, 75 insertions(+), 89 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/60145/1
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index 462b694..b938ed7 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -17,6 +17,81 @@ select MAINBOARD_HAS_TPM2 select SOC_INTEL_KABYLAKE
+config BOARD_GOOGLE_ATLAS + select BOARD_GOOGLE_BASEBOARD_POPPY + 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 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 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 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 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 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 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
config CHROMEOS_WIFI_SAR @@ -127,81 +202,6 @@ 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 diff --git a/src/mainboard/google/poppy/Kconfig.name b/src/mainboard/google/poppy/Kconfig.name index fe0dd17..4b1fe69 100644 --- a/src/mainboard/google/poppy/Kconfig.name +++ b/src/mainboard/google/poppy/Kconfig.name @@ -2,18 +2,12 @@
config BOARD_GOOGLE_ATLAS bool "-> Atlas (Google Pixelbook Go)" - select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_ATLAS
config BOARD_GOOGLE_POPPY bool "-> Poppy" - select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_POPPY
config BOARD_GOOGLE_NAMI bool "-> Nami" - select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_NAMI help The Nami board supports the following devices: - Acer Chromebook 13 / Spin 13 (Akali) @@ -24,18 +18,12 @@
config BOARD_GOOGLE_NAUTILUS bool "-> Nautilus (Samsung Chromebook Plus V2, V2 LTE)" - select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_NAUTILUS
config BOARD_GOOGLE_NOCTURNE bool "-> Nocturne (Google Pixel Slate)" - select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_NOCTURNE
config BOARD_GOOGLE_RAMMUS bool "-> Rammus" - select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_RAMMUS help The Rammus board supports the following devices: - Asus Chromebook C425 (Leona) @@ -43,5 +31,3 @@
config BOARD_GOOGLE_SORAKA bool "-> Soraka (HP Chromebook x2)" - select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_SORAKA