diff options
| author | Felix Singer <felixsinger@posteo.net> | 2021-12-24 19:22:22 +0100 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2021-12-29 18:44:19 +0000 |
| commit | 0f6de92fc38a9c814ae7a55ca86c19075e7184f1 (patch) | |
| tree | 994b76311866fdd41539e88a1cf1d8c811e59e47 | |
| parent | c660a911d97ecbf9a8a65105db4772489e6a5151 (diff) | |
mb/google/octopus: Drop unnecessary option
Since all variants select the option `BASEBOARD_OCTOPUS_LAPTOP`, drop it
and move its selects to the common baseboard.
Change-Id: Ia3d220401eeaa4255d6a4472eeed15c51f6a81a9
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60345
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
| -rw-r--r-- | src/mainboard/google/octopus/Kconfig | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig index 08ddd80dbc..496784fc44 100644 --- a/src/mainboard/google/octopus/Kconfig +++ b/src/mainboard/google/octopus/Kconfig @@ -27,65 +27,56 @@ config BOARD_GOOGLE_BASEBOARD_OCTOPUS select NO_FMAP_CACHE select SOC_ESPI select SOC_INTEL_GEMINILAKE + select SYSTEM_TYPE_LAPTOP config BOARD_GOOGLE_AMPTON - select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS select INTEL_GMA_HAVE_VBT select NHLT_RT5682 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_BLOOG - select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_BOBBA - select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_CASTA - select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_DOOD - select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS select NHLT_DA7219 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_FLEEX - select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_FOOB - select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS select NHLT_DA7219 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_GARG - select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_LICK - select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS config BOARD_GOOGLE_MEEP - select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS @@ -93,10 +84,8 @@ config BOARD_GOOGLE_MEEP config BOARD_GOOGLE_OCTOPUS select BOARD_GOOGLE_BASEBOARD_OCTOPUS - select BASEBOARD_OCTOPUS_LAPTOP config BOARD_GOOGLE_PHASER - select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS @@ -104,7 +93,6 @@ config BOARD_GOOGLE_PHASER config BOARD_GOOGLE_YORP select BOARD_GOOGLE_BASEBOARD_OCTOPUS - select BASEBOARD_OCTOPUS_LAPTOP select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS @@ -118,10 +106,6 @@ config CHROMEOS_WIFI_SAR select SAR_ENABLE select USE_SAR -config BASEBOARD_OCTOPUS_LAPTOP - def_bool n - select SYSTEM_TYPE_LAPTOP - config CHROMEOS select EC_GOOGLE_CHROMEEC_SWITCHES select HAS_RECOVERY_MRC_CACHE |