Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37310 )
Change subject: mb/google/poppy: auto-select correct audio blobs ......................................................................
mb/google/poppy: auto-select correct audio blobs
Auto-select the correct audio blobs needed for each variant if USE_BLOBS is selected. Audio is non-functional without them, so only reason to not select is for build testing w/o USE_BLOBS.
Alphabetize config options selected by each variant since we're already touching them.
Change-Id: I96b9e21aa0b392d07b4f49ed6b39b49d39892fb6 Signed-off-by: Matt DeVillier matt.devillier@gmail.com --- M src/mainboard/google/poppy/Kconfig 1 file changed, 11 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/37310/1
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index 85dc9a5..e8fb38d 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -49,6 +49,7 @@
config INCLUDE_NHLT_BLOBS bool "Include blobs for audio." + default y if USE_BLOBS select NHLT_DMIC_2CH select NHLT_DMIC_4CH select NHLT_MAX98927 @@ -142,16 +143,17 @@ select DRIVERS_SPI_ACPI select DRIVERS_USB_ACPI select EXCLUDE_NATIVE_SD_INTERFACE + select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR + select INCLUDE_NHLT_BLOBS_ATLAS if USE_BLOBS select MAINBOARD_HAS_SPI_TPM_CR50 select VARIANT_HAS_CAMERA_ACPI - select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config VARIANT_SPECIFIC_OPTIONS_POPPY def_bool n select DRIVERS_I2C_MAX98927 + select MAINBOARD_HAS_I2C_TPM_CR50 select NO_FADT_8042 select VARIANT_HAS_CAMERA_ACPI - select MAINBOARD_HAS_I2C_TPM_CR50
config VARIANT_SPECIFIC_OPTIONS_NAMI def_bool n @@ -160,6 +162,7 @@ select DRIVERS_I2C_DA7219 select DRIVERS_SPI_ACPI select EXCLUDE_NATIVE_SD_INTERFACE + select INCLUDE_NHLT_BLOBS_NAMI if USE_BLOBS select MAINBOARD_HAS_SPI_TPM_CR50
config VARIANT_SPECIFIC_OPTIONS_NAUTILUS @@ -167,8 +170,9 @@ select CHROMEOS_WIFI_SAR if CHROMEOS select DRIVERS_GENERIC_MAX98357A select DRIVERS_I2C_DA7219 - select VARIANT_HAS_CAMERA_ACPI + select INCLUDE_NHLT_BLOBS_NAUTILUS if USE_BLOBS select MAINBOARD_HAS_I2C_TPM_CR50 + select VARIANT_HAS_CAMERA_ACPI
config VARIANT_SPECIFIC_OPTIONS_NOCTURNE def_bool n @@ -179,10 +183,11 @@ select DRIVERS_SPI_ACPI select DRIVERS_USB_ACPI select EXCLUDE_NATIVE_SD_INTERFACE + select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR + select INCLUDE_NHLT_BLOBS_NOCTURNE if USE_BLOBS select MAINBOARD_HAS_SPI_TPM_CR50 select NO_FADT_8042 select VARIANT_HAS_CAMERA_ACPI - select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config VARIANT_SPECIFIC_OPTIONS_RAMMUS def_bool n @@ -191,14 +196,15 @@ select DRIVERS_I2C_DA7219 select DRIVERS_SPI_ACPI select DRIVERS_USB_ACPI + select INCLUDE_NHLT_BLOBS_RAMMUS if USE_BLOBS select MAINBOARD_HAS_SPI_TPM_CR50
config VARIANT_SPECIFIC_OPTIONS_SORAKA def_bool n select DRIVERS_I2C_MAX98927 select NO_FADT_8042 - select VARIANT_HAS_CAMERA_ACPI select MAINBOARD_HAS_I2C_TPM_CR50 + select VARIANT_HAS_CAMERA_ACPI
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES