mb/google/poppy: set SMBIOS enclosure type for all poppy variants

Some poppy variants did not select a system type, which led to the
default desktop type being set. Select the best fit enclosure type
for each variant.
Alphabetize the variant-specific options for improved readability.

Change-Id: I7c23f8fa3ae1de67f7a68b8a4e9ec16c4e8044df
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58229
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Matt DeVillier 2021-10-07 18:27:14 -05:00 committed by Felix Held
parent f72c7b154d
commit 302b1e508c
1 changed files with 11 additions and 6 deletions

View File

@ -135,17 +135,19 @@ config VARIANT_SPECIFIC_OPTIONS_ATLAS
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
select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config VARIANT_SPECIFIC_OPTIONS_POPPY
def_bool n
select DRIVERS_I2C_MAX98927
select NO_FADT_8042
select VARIANT_HAS_CAMERA_ACPI
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
@ -155,14 +157,16 @@ config VARIANT_SPECIFIC_OPTIONS_NAMI
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 VARIANT_HAS_CAMERA_ACPI
select MAINBOARD_HAS_I2C_TPM_CR50
select SYSTEM_TYPE_CONVERTIBLE
select VARIANT_HAS_CAMERA_ACPI
config VARIANT_SPECIFIC_OPTIONS_NOCTURNE
def_bool n
@ -173,11 +177,11 @@ config VARIANT_SPECIFIC_OPTIONS_NOCTURNE
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
select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config VARIANT_SPECIFIC_OPTIONS_RAMMUS
def_bool n
@ -188,14 +192,15 @@ config VARIANT_SPECIFIC_OPTIONS_RAMMUS
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
select MAINBOARD_HAS_I2C_TPM_CR50
config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES