GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Felix Singer 2021-12-24 19:22:22 +01:00
parent c660a911d9
commit 0f6de92fc3
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mainboard/google/octopus/Kconfig
View File

@ -27,65 +27,56 @@ config BOARD_GOOGLE_BASEBOARD_OCTOPUS
select NO_FMAP_CACHE select NO_FMAP_CACHE
select SOC_ESPI select SOC_ESPI
select SOC_INTEL_GEMINILAKE select SOC_INTEL_GEMINILAKE
select SYSTEM_TYPE_LAPTOP
config BOARD_GOOGLE_AMPTON config BOARD_GOOGLE_AMPTON
select BASEBOARD_OCTOPUS_LAPTOP
select BOARD_GOOGLE_BASEBOARD_OCTOPUS select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select NHLT_RT5682 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
config BOARD_GOOGLE_BLOOG config BOARD_GOOGLE_BLOOG
select BASEBOARD_OCTOPUS_LAPTOP
select BOARD_GOOGLE_BASEBOARD_OCTOPUS select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
select NHLT_RT5682 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
config BOARD_GOOGLE_BOBBA config BOARD_GOOGLE_BOBBA
select BASEBOARD_OCTOPUS_LAPTOP
select BOARD_GOOGLE_BASEBOARD_OCTOPUS select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
select NHLT_RT5682 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
config BOARD_GOOGLE_CASTA config BOARD_GOOGLE_CASTA
select BASEBOARD_OCTOPUS_LAPTOP
select BOARD_GOOGLE_BASEBOARD_OCTOPUS select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
config BOARD_GOOGLE_DOOD config BOARD_GOOGLE_DOOD
select BASEBOARD_OCTOPUS_LAPTOP
select BOARD_GOOGLE_BASEBOARD_OCTOPUS select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
config BOARD_GOOGLE_FLEEX config BOARD_GOOGLE_FLEEX
select BASEBOARD_OCTOPUS_LAPTOP
select BOARD_GOOGLE_BASEBOARD_OCTOPUS select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
select NHLT_RT5682 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
config BOARD_GOOGLE_FOOB config BOARD_GOOGLE_FOOB
select BASEBOARD_OCTOPUS_LAPTOP
select BOARD_GOOGLE_BASEBOARD_OCTOPUS select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
config BOARD_GOOGLE_GARG config BOARD_GOOGLE_GARG
select BASEBOARD_OCTOPUS_LAPTOP
select BOARD_GOOGLE_BASEBOARD_OCTOPUS select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
select NHLT_RT5682 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
config BOARD_GOOGLE_LICK config BOARD_GOOGLE_LICK
select BASEBOARD_OCTOPUS_LAPTOP
select BOARD_GOOGLE_BASEBOARD_OCTOPUS select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
config BOARD_GOOGLE_MEEP config BOARD_GOOGLE_MEEP
select BASEBOARD_OCTOPUS_LAPTOP
select BOARD_GOOGLE_BASEBOARD_OCTOPUS select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
@ -93,10 +84,8 @@ config BOARD_GOOGLE_MEEP
config BOARD_GOOGLE_OCTOPUS config BOARD_GOOGLE_OCTOPUS
select BOARD_GOOGLE_BASEBOARD_OCTOPUS select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select BASEBOARD_OCTOPUS_LAPTOP
config BOARD_GOOGLE_PHASER config BOARD_GOOGLE_PHASER
select BASEBOARD_OCTOPUS_LAPTOP
select BOARD_GOOGLE_BASEBOARD_OCTOPUS select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
@ -104,7 +93,6 @@ config BOARD_GOOGLE_PHASER
config BOARD_GOOGLE_YORP config BOARD_GOOGLE_YORP
select BOARD_GOOGLE_BASEBOARD_OCTOPUS select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select BASEBOARD_OCTOPUS_LAPTOP
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
@ -118,10 +106,6 @@ config CHROMEOS_WIFI_SAR
select SAR_ENABLE select SAR_ENABLE
select USE_SAR select USE_SAR
config BASEBOARD_OCTOPUS_LAPTOP
def_bool n
select SYSTEM_TYPE_LAPTOP
config CHROMEOS config CHROMEOS
select EC_GOOGLE_CHROMEEC_SWITCHES select EC_GOOGLE_CHROMEEC_SWITCHES
select HAS_RECOVERY_MRC_CACHE select HAS_RECOVERY_MRC_CACHE