Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42144 )
Change subject: mb/google/poppy: Drop VARIANT_SPECIFIC_OPTIONS_* ......................................................................
mb/google/poppy: Drop VARIANT_SPECIFIC_OPTIONS_*
Putting variant-specific options in Kconfig.name seems to be what is popular now, so we might as well do the same for Poppy.
Change-Id: I8ce3237ac620c26856b6cf3d08293729641dd0b0 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/google/poppy/Kconfig M src/mainboard/google/poppy/Kconfig.name 2 files changed, 49 insertions(+), 77 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/42144/1
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index 8553821..4298950 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -134,76 +134,6 @@ bool default n
-config VARIANT_SPECIFIC_OPTIONS_ATLAS - def_bool n - select CHROMEOS_WIFI_SAR if CHROMEOS - select DRIVERS_I2C_MAX98373 - select DRIVERS_I2C_DA7219 - select DRIVERS_SPI_ACPI - select DRIVERS_USB_ACPI - select EXCLUDE_NATIVE_SD_INTERFACE - select MAINBOARD_HAS_LIBGFXINIT - 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 NO_FADT_8042 - select VARIANT_HAS_CAMERA_ACPI - select MAINBOARD_HAS_I2C_TPM_CR50 - -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 - -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 - -config VARIANT_SPECIFIC_OPTIONS_NOCTURNE - def_bool n - select CHROMEOS_WIFI_SAR if CHROMEOS - select DRIVERS_I2C_SX9310 if CHROMEOS_WIFI_SAR - select DRIVERS_I2C_MAX98373 - select DRIVERS_I2C_DA7219 - select DRIVERS_SPI_ACPI - select DRIVERS_USB_ACPI - select EXCLUDE_NATIVE_SD_INTERFACE - 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 - select CHROMEOS_WIFI_SAR if CHROMEOS - select DRIVERS_I2C_MAX98927 - select DRIVERS_I2C_DA7219 - select DRIVERS_SPI_ACPI - select DRIVERS_USB_ACPI - select MAINBOARD_HAS_LIBGFXINIT - select MAINBOARD_HAS_SPI_TPM_CR50 - -config VARIANT_SPECIFIC_OPTIONS_SORAKA - def_bool n - select DRIVERS_I2C_MAX98927 - 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 select HAS_RECOVERY_MRC_CACHE diff --git a/src/mainboard/google/poppy/Kconfig.name b/src/mainboard/google/poppy/Kconfig.name index 9ecdb44..cf8d2c1 100644 --- a/src/mainboard/google/poppy/Kconfig.name +++ b/src/mainboard/google/poppy/Kconfig.name @@ -3,34 +3,76 @@ config BOARD_GOOGLE_ATLAS bool "-> Atlas (Google Pixelbook Go)" select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_ATLAS + select CHROMEOS_WIFI_SAR if CHROMEOS + select DRIVERS_I2C_MAX98373 + select DRIVERS_I2C_DA7219 + select DRIVERS_SPI_ACPI + select DRIVERS_USB_ACPI + select EXCLUDE_NATIVE_SD_INTERFACE + select MAINBOARD_HAS_LIBGFXINIT + select MAINBOARD_HAS_SPI_TPM_CR50 + select VARIANT_HAS_CAMERA_ACPI + select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config BOARD_GOOGLE_POPPY bool "-> Poppy" select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_POPPY + select DRIVERS_I2C_MAX98927 + select NO_FADT_8042 + select VARIANT_HAS_CAMERA_ACPI + select MAINBOARD_HAS_I2C_TPM_CR50
config BOARD_GOOGLE_NAMI bool "-> 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
config BOARD_GOOGLE_NAUTILUS bool "-> Nautilus (Samsung Chromebook Plus (V2 / LTE))" 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 VARIANT_HAS_CAMERA_ACPI + select MAINBOARD_HAS_I2C_TPM_CR50
config BOARD_GOOGLE_NOCTURNE bool "-> Nocturne (Google Pixel Slate)" select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_NOCTURNE + select CHROMEOS_WIFI_SAR if CHROMEOS + select DRIVERS_I2C_SX9310 if CHROMEOS_WIFI_SAR + select DRIVERS_I2C_MAX98373 + select DRIVERS_I2C_DA7219 + select DRIVERS_SPI_ACPI + select DRIVERS_USB_ACPI + select EXCLUDE_NATIVE_SD_INTERFACE + 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 BOARD_GOOGLE_RAMMUS bool "-> Rammus (Asus Chromebook C425, Flip C433, Flip C434)" select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_RAMMUS + select CHROMEOS_WIFI_SAR if CHROMEOS + select DRIVERS_I2C_MAX98927 + select DRIVERS_I2C_DA7219 + select DRIVERS_SPI_ACPI + select DRIVERS_USB_ACPI + select MAINBOARD_HAS_LIBGFXINIT + select MAINBOARD_HAS_SPI_TPM_CR50
config BOARD_GOOGLE_SORAKA bool "-> Soraka (HP Chromebook x2)" select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_SORAKA + select DRIVERS_I2C_MAX98927 + select NO_FADT_8042 + select SYSTEM_TYPE_DETACHABLE + select VARIANT_HAS_CAMERA_ACPI + select MAINBOARD_HAS_I2C_TPM_CR50
Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42144 )
Change subject: mb/google/poppy: Drop VARIANT_SPECIFIC_OPTIONS_* ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/42144/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/42144/1//COMMIT_MSG@9 PS1, Line 9: Putting variant-specific options in Kconfig.name seems to be what is : popular now is this the way things are going? Not sure splitting mainboard Kconfig selections between two files is ideal...
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42144 )
Change subject: mb/google/poppy: Drop VARIANT_SPECIFIC_OPTIONS_* ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/42144/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/42144/1//COMMIT_MSG@9 PS1, Line 9: Putting variant-specific options in Kconfig.name seems to be what is : popular now
is this the way things are going? Not sure splitting mainboard Kconfig selections between two files […]
More recent google boards do it, for example Hatch. I'd say it is less error-prone than redundant symbols that can get mixed up.
In any case, we can't simply get rid of Kconfig.name because mainboard selection is a prompt.
Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42144 )
Change subject: mb/google/poppy: Drop VARIANT_SPECIFIC_OPTIONS_* ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/42144/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/42144/1//COMMIT_MSG@9 PS1, Line 9: Putting variant-specific options in Kconfig.name seems to be what is : popular now
More recent google boards do it, for example Hatch. […]
wasn't suggesting we get rid of it, just noting that it makes it much harder to figure out which board-level symbols are being selected when you have to jump back and forth between two files.
and I guess I kinda started this when I migrated all the Glados boards to a variant setup
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42144 )
Change subject: mb/google/poppy: Drop VARIANT_SPECIFIC_OPTIONS_* ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/42144/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/42144/1//COMMIT_MSG@9 PS1, Line 9: Putting variant-specific options in Kconfig.name seems to be what is : popular now
wasn't suggesting we get rid of it, just noting that it makes it much harder to figure out which boa […]
Right, I don't know if we can "expand" the symbols later on in Kconfig. I'll try that.
Angel Pons has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/42144 )
Change subject: mb/google/poppy: Drop VARIANT_SPECIFIC_OPTIONS_* ......................................................................
Abandoned
lack of interest
-
Angel Pons (Code Review) -
Matt DeVillier (Code Review)