4 files changed, 15 insertions, 9 deletions
diff --git a/src/mainboard/google/brox/Kconfig b/src/mainboard/google/brox/Kconfig
index fb3dfc4428..11bcfe6304 100644
--- a/src/mainboard/google/brox/Kconfig
+++ b/src/mainboard/google/brox/Kconfig
@@ -1,8 +1,5 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-config ACPI_FNKEY_GEN_SCANCODE
-	default 94 if (BOARD_GOOGLE_LOTSO || BOARD_GOOGLE_JUBILANT)
-
 config BOARD_GOOGLE_BROX_COMMON
 	def_bool n
 	select DRIVERS_GENERIC_GPIO_KEYS
@@ -74,6 +71,7 @@ config BOARD_GOOGLE_BROX_EC_ISH
 config BOARD_GOOGLE_LOTSO
 	select BOARD_GOOGLE_BASEBOARD_BROX
 	select CHROMEOS_WIFI_SAR if CHROMEOS
+	select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
 	select USE_UNIFIED_AP_FIRMWARE_FOR_UFS_AND_NON_UFS
 
 config BOARD_GOOGLE_GREENBAYUPOC
@@ -86,6 +84,7 @@ config BOARD_GOOGLE_JUBILANT
 	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_GENERIC_ALC1015
 	select DRIVERS_I2C_SX9324
+	select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
 	select USE_UNIFIED_AP_FIRMWARE_FOR_UFS_AND_NON_UFS
 
 if BOARD_GOOGLE_BROX_COMMON
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index 08cb3dbe6d..32199c91d1 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -1,8 +1,5 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-config ACPI_FNKEY_GEN_SCANCODE
-	default 94 if (BOARD_GOOGLE_XOL || BOARD_GOOGLE_RIVEN || BOARD_GOOGLE_RULL)
-
 config BOARD_GOOGLE_BRYA_COMMON
 	def_bool n
 	select DRIVERS_GENERIC_ALC1015
@@ -483,6 +480,7 @@ config BOARD_GOOGLE_RIVEN
 	select DRIVERS_INTEL_MIPI_CAMERA
 	select HAVE_WWAN_POWER_SEQUENCE
 	select INTEL_GMA_HAVE_VBT
+	select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
 	select SOC_INTEL_TWINLAKE
 	select USE_UNIFIED_AP_FIRMWARE_FOR_UFS_AND_NON_UFS
 
@@ -493,6 +491,7 @@ config BOARD_GOOGLE_RULL
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_GPIO_KEYS
 	select DRIVERS_GFX_GENERIC
+	select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
 	select SOC_INTEL_TWINLAKE
 
 config BOARD_GOOGLE_SKOLAS
@@ -631,6 +630,7 @@ config BOARD_GOOGLE_XOL
 	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_I2C_DA7219
 	select DRIVERS_INTEL_ISH
+	select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
 	select SOC_INTEL_RAPTORLAKE
 	select USE_UNIFIED_AP_FIRMWARE_FOR_UFS_AND_NON_UFS
 
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig
index 46beebc6b3..d6d41368c8 100644
--- a/src/mainboard/google/dedede/Kconfig
+++ b/src/mainboard/google/dedede/Kconfig
@@ -1,8 +1,5 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-config ACPI_FNKEY_GEN_SCANCODE
-	default 94 if BOARD_GOOGLE_AWASUKI
-
 config BOARD_GOOGLE_BASEBOARD_DEDEDE
 	def_bool n
 	select BOARD_ROMSIZE_KB_16384 if !BOARD_ROMSIZE_KB_32768
@@ -42,6 +39,7 @@ config BOARD_GOOGLE_BASEBOARD_DEDEDE
 config BOARD_GOOGLE_AWASUKI
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
+	select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
 	select SOC_INTEL_COMMON_BLOCK_IPU
 	select INTEL_GMA_HAVE_VBT
 
diff --git a/src/vendorcode/google/Kconfig b/src/vendorcode/google/Kconfig
index 796f8b4089..b24c554147 100644
--- a/src/vendorcode/google/Kconfig
+++ b/src/vendorcode/google/Kconfig
@@ -28,3 +28,12 @@ config GOOGLE_DSM_PARAM_FILE_NAME
 	  On some boards, there are different dsm parameter files for Dynamic Speaker
 	  Management (DSM). Enable this config to assign dsm parameters file name in ACPI
 	  SSDT table. Kernel driver uses this to load the DSM parameter file.
+
+config MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
+	bool
+	default n
+	help
+	  Select this config to indicate that a board has Strauss keyboard.
+
+config ACPI_FNKEY_GEN_SCANCODE
+	default 94 if MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD