Change in coreboot[master]: mb/google/octopus: Drop unnecessary option

[Felix Singer (Code Review)]

Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/60345 )

Change subject: mb/google/octopus: Drop unnecessary option
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60345
Tested-by: build bot (Jenkins) 
Reviewed-by: Kyösti Mälkki 
---
M src/mainboard/google/octopus/Kconfig
1 file changed, 1 insertion(+), 17 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved

diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index 08ddd80..496784f 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -27,65 +27,56 @@
    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_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_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 @@
    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

2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.