3 files changed, 13 insertions, 13 deletions
diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name
index 9cdc8e7c9e..14aa8d0f6c 100644
--- a/src/mainboard/google/brya/Kconfig.name
+++ b/src/mainboard/google/brya/Kconfig.name
@@ -57,16 +57,16 @@ config BOARD_GOOGLE_FELWINTER
 config BOARD_GOOGLE_GIMBLE
 	bool "->  Gimble"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
-	select CHROMEOS_DSM_CALIB if CHROMEOS
-	select CHROMEOS_DSM_PARAM_FILE_NAME if CHROMEOS
+	select GOOGLE_DSM_CALIB if VPD
+	select GOOGLE_DSM_PARAM_FILE_NAME if VPD
 	select DRIVERS_GENESYSLOGIC_GL9750
 	select DRIVERS_I2C_MAX98390
 
 config BOARD_GOOGLE_GIMBLE4ES
 	bool "->  Gimble4ES"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
-	select CHROMEOS_DSM_CALIB if CHROMEOS
-	select CHROMEOS_DSM_PARAM_FILE_NAME if CHROMEOS
+	select GOOGLE_DSM_CALIB if VPD
+	select GOOGLE_DSM_PARAM_FILE_NAME if VPD
 	select DEFAULT_ADL_NEM
 	select DRIVERS_GENESYSLOGIC_GL9750
 	select DRIVERS_I2C_MAX98390
@@ -118,8 +118,8 @@ config BOARD_GOOGLE_PRIMUS4ES
 config BOARD_GOOGLE_REDRIX
 	bool "->  Redrix"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
-	select CHROMEOS_DSM_CALIB if CHROMEOS
-	select CHROMEOS_DSM_PARAM_FILE_NAME if CHROMEOS
+	select GOOGLE_DSM_CALIB if VPD
+	select GOOGLE_DSM_PARAM_FILE_NAME if VPD
 	select DRIVERS_GENESYSLOGIC_GL9755
 	select DRIVERS_GFX_GENERIC
 	select DRIVERS_I2C_MAX98390
@@ -130,8 +130,8 @@ config BOARD_GOOGLE_REDRIX
 config BOARD_GOOGLE_REDRIX4ES
 	bool "->  Redrix4ES"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
-	select CHROMEOS_DSM_CALIB if CHROMEOS
-	select CHROMEOS_DSM_PARAM_FILE_NAME if CHROMEOS
+	select GOOGLE_DSM_CALIB if VPD
+	select GOOGLE_DSM_PARAM_FILE_NAME if VPD
 	select DEFAULT_ADL_NEM
 	select DRIVERS_GENESYSLOGIC_GL9755
 	select DRIVERS_GFX_GENERIC
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index 174978e7e5..c674036735 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -44,13 +44,13 @@ config BOARD_GOOGLE_HATCH
 
 config BOARD_GOOGLE_HELIOS
 	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select CHROMEOS_DSM_CALIB if CHROMEOS
+	select GOOGLE_DSM_CALIB if VPD
 	select DRIVERS_I2C_RT1011
 	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_HELIOS_DISKSWAP
 	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select CHROMEOS_DSM_CALIB if CHROMEOS
+	select GOOGLE_DSM_CALIB if VPD
 	select DRIVERS_I2C_RT1011
 	select INTEL_GMA_HAVE_VBT
 
@@ -74,13 +74,13 @@ config BOARD_GOOGLE_MUSHU
 
 config BOARD_GOOGLE_NIGHTFURY
 	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select CHROMEOS_DSM_CALIB if CHROMEOS
+	select GOOGLE_DSM_CALIB if VPD
 	select DRIVERS_I2C_MAX98390
 	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_PALKIA
 	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select CHROMEOS_DSM_CALIB if CHROMEOS
+	select GOOGLE_DSM_CALIB if VPD
 	select DRIVERS_I2C_RT1011
 
 if BOARD_GOOGLE_BASEBOARD_HATCH
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index f4ab6de479..7064a14d06 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -77,7 +77,7 @@ config BOARD_GOOGLE_HALVOR
 
 config BOARD_GOOGLE_LINDAR
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
-	select CHROMEOS_DSM_CALIB if CHROMEOS
+	select GOOGLE_DSM_CALIB if VPD
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_I2C_RT1011
 	select INTEL_CAR_NEM