diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name
index ea0688686b..1380a2a458 100644
--- a/src/mainboard/google/brya/Kconfig.name
+++ b/src/mainboard/google/brya/Kconfig.name
@@ -3,22 +3,22 @@ comment "Brya"
 config BOARD_GOOGLE_AGAH
 	bool "->  Agah"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
-	select SOC_INTEL_RAPTORLAKE
 	select DRIVERS_GENESYSLOGIC_GL9750
 	select INCLUDE_NVIDIA_GPU_ASL
 	select PCIEXP_SUPPORT_RESIZABLE_BARS
 	select RT8168_GEN_ACPI_POWER_RESOURCE
 	select RT8168_GET_MAC_FROM_VPD
 	select RT8168_SET_LED_MODE
+	select SOC_INTEL_RAPTORLAKE
 
 config BOARD_GOOGLE_ANAHERA
 	bool "->  Anahera"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
 	select DRIVERS_GENESYSLOGIC_GL9763E
 	select DRIVERS_GENESYSLOGIC_GL9750
-	select INTEL_GMA_HAVE_VBT
 	select HAVE_PCIE_WWAN
 	select HAVE_WWAN_POWER_SEQUENCE
+	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_ANAHERA4ES
 	bool "->  Anahera4ES"
@@ -39,13 +39,13 @@ config BOARD_GOOGLE_BRASK
 config BOARD_GOOGLE_BRYA0
 	bool "->  Brya 0"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
-	select SOC_INTEL_RAPTORLAKE
 	select DRIVERS_GENESYSLOGIC_GL9755
 	select DRIVERS_I2C_SX9324
 	select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
 	select DRIVERS_INTEL_MIPI_CAMERA
 	select SOC_INTEL_COMMON_BLOCK_IPU
 	select SOC_INTEL_CRASHLOG
+	select SOC_INTEL_RAPTORLAKE
 
 config BOARD_GOOGLE_FELWINTER
 	bool "->  Felwinter"
@@ -58,31 +58,31 @@ config BOARD_GOOGLE_FELWINTER
 config BOARD_GOOGLE_GIMBLE
 	bool "->  Gimble"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
-	select GOOGLE_DSM_CALIB if VPD
-	select GOOGLE_DSM_PARAM_FILE_NAME if VPD
 	select DRIVERS_GENESYSLOGIC_GL9750
 	select DRIVERS_I2C_MAX98390
+	select GOOGLE_DSM_CALIB if VPD
+	select GOOGLE_DSM_PARAM_FILE_NAME if VPD
 	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_GIMBLE4ES
 	bool "->  Gimble4ES"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
-	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
+	select GOOGLE_DSM_CALIB if VPD
+	select GOOGLE_DSM_PARAM_FILE_NAME if VPD
 
 config BOARD_GOOGLE_KANO
 	bool "->  Kano"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
+	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_I2C_MAX98373
 	select DRIVERS_I2C_NAU8825
 	select DRIVERS_INTEL_MIPI_CAMERA
+	select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
 	select INTEL_GMA_HAVE_VBT
 	select SOC_INTEL_COMMON_BLOCK_IPU
-	select CHROMEOS_WIFI_SAR if CHROMEOS
-	select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
 	select SOC_INTEL_RAPTORLAKE
 
 config BOARD_GOOGLE_NIVVIKS
@@ -125,41 +125,40 @@ config BOARD_GOOGLE_REDRIX
 	bool "->  Redrix"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
 	select GOOGLE_DSM_CALIB if VPD
-	select GOOGLE_DSM_PARAM_FILE_NAME if VPD
 	select DRIVERS_GENESYSLOGIC_GL9755
 	select DRIVERS_I2C_MAX98390
 	select DRIVERS_INTEL_MIPI_CAMERA
 	select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
+	select GOOGLE_DSM_PARAM_FILE_NAME if VPD
 	select INTEL_GMA_HAVE_VBT
 	select SOC_INTEL_COMMON_BLOCK_IPU
 
 config BOARD_GOOGLE_REDRIX4ES
 	bool "->  Redrix4ES"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
-	select GOOGLE_DSM_CALIB if VPD
-	select GOOGLE_DSM_PARAM_FILE_NAME if VPD
 	select DEFAULT_ADL_NEM
 	select DRIVERS_GENESYSLOGIC_GL9755
 	select DRIVERS_I2C_MAX98390
 	select DRIVERS_INTEL_MIPI_CAMERA
 	select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
+	select GOOGLE_DSM_CALIB if VPD
+	select GOOGLE_DSM_PARAM_FILE_NAME if VPD
 	select SOC_INTEL_COMMON_BLOCK_IPU
 
 config BOARD_GOOGLE_SKOLAS
 	bool "->  Skolas"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
-	select SOC_INTEL_RAPTORLAKE
 	select DRIVERS_GENESYSLOGIC_GL9755
 	select DRIVERS_INTEL_MIPI_CAMERA
 	select DRIVERS_I2C_SX9324
 	select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
 	select INTEL_GMA_HAVE_VBT
 	select SOC_INTEL_COMMON_BLOCK_IPU
+	select SOC_INTEL_RAPTORLAKE
 
 config BOARD_GOOGLE_SKOLAS4ES
 	bool "->  Skolas4ES"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
-	select SOC_INTEL_RAPTORLAKE
 	select DEFAULT_ADL_NEM
 	select DRIVERS_GENESYSLOGIC_GL9755
 	select DRIVERS_INTEL_MIPI_CAMERA
@@ -167,35 +166,36 @@ config BOARD_GOOGLE_SKOLAS4ES
 	select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
 	select INTEL_GMA_HAVE_VBT
 	select SOC_INTEL_COMMON_BLOCK_IPU
+	select SOC_INTEL_RAPTORLAKE
 
 config BOARD_GOOGLE_TAEKO
 	bool "->  Taeko"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
+	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENESYSLOGIC_GL9750
 	select DRIVERS_GENESYSLOGIC_GL9763E
 	select DRIVERS_GENESYSLOGIC_GL9763E_L1_MAX if DRIVERS_GENESYSLOGIC_GL9763E
-	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select INTEL_GMA_HAVE_VBT
 	select SOC_INTEL_RAPTORLAKE
 
 config BOARD_GOOGLE_TAEKO4ES
 	bool "->  Taeko4ES"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
+	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DEFAULT_ADL_NEM
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENESYSLOGIC_GL9750
 	select DRIVERS_GENESYSLOGIC_GL9763E
-	select CHROMEOS_WIFI_SAR if CHROMEOS
 
 config BOARD_GOOGLE_TANIKS
 	bool "->  Taniks"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
+	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENESYSLOGIC_GL9750
 	select DRIVERS_GENESYSLOGIC_GL9763E
 	select DRIVERS_GENESYSLOGIC_GL9763E_L1_MAX
-	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_VELL
@@ -218,10 +218,10 @@ config BOARD_GOOGLE_VOLMAR
 config BOARD_GOOGLE_BANSHEE
 	bool "->  Banshee"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
-	select MEMORY_SODIMM
 	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_GENERIC_GPIO_KEYS
 	select INTEL_GMA_HAVE_VBT
+	select MEMORY_SODIMM
 
 config BOARD_GOOGLE_CROTA
 	bool "->  Crota"
@@ -246,12 +246,12 @@ config BOARD_GOOGLE_KINOX
 config BOARD_GOOGLE_CRAASK
 	bool "->  Craask"
 	select BOARD_GOOGLE_BASEBOARD_NISSA
+	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_GENERIC_GPIO_KEYS
 	select DRIVERS_GENESYSLOGIC_GL9750
 	select DRIVERS_INTEL_MIPI_CAMERA
-	select HAVE_WWAN_POWER_SEQUENCE
-	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
+	select HAVE_WWAN_POWER_SEQUENCE
 	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_OSIRIS
@@ -291,6 +291,7 @@ config BOARD_GOOGLE_JOXER
 config BOARD_GOOGLE_PUJJO
 	bool "->  Pujjo"
 	select BOARD_GOOGLE_BASEBOARD_NISSA
+	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_GPIO_KEYS
 	select DRIVERS_GENESYSLOGIC_GL9750
@@ -300,7 +301,6 @@ config BOARD_GOOGLE_PUJJO
 	select HAVE_PCIE_WWAN
 	select HAVE_WWAN_POWER_SEQUENCE
 	select INTEL_GMA_HAVE_VBT
-	select CHROMEOS_WIFI_SAR if CHROMEOS
 
 config BOARD_GOOGLE_XIVU
 	bool "->  Xivu"
@@ -318,65 +318,65 @@ config BOARD_GOOGLE_GAELIN
 config BOARD_GOOGLE_YAVIKS
 	bool "->  Yaviks"
 	select BOARD_GOOGLE_BASEBOARD_NISSA
-	select DRIVERS_GENESYSLOGIC_GL9750
 	select CHROMEOS_WIFI_SAR if CHROMEOS
+	select DRIVERS_GENESYSLOGIC_GL9750
 	select DRIVERS_GENERIC_GPIO_KEYS
 	select DRIVERS_INTEL_MIPI_CAMERA
-	select HAVE_WWAN_POWER_SEQUENCE
 	select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
+	select HAVE_WWAN_POWER_SEQUENCE
 	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_LISBON
 	bool "->  Lisbon"
 	select BOARD_GOOGLE_BASEBOARD_BRASK
-	select SOC_INTEL_RAPTORLAKE
 	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_GENESYSLOGIC_GL9750
 	select DRIVERS_GENESYSLOGIC_GL9763E
 	select INTEL_GMA_HAVE_VBT
+	select SOC_INTEL_RAPTORLAKE
 
 config BOARD_GOOGLE_ZYDRON
 	bool "->  Zydron"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
-	select SOC_INTEL_RAPTORLAKE
+	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DEFAULT_ADL_NEM
 	select DRIVERS_I2C_MAX98373
 	select DRIVERS_I2C_NAU8825
 	select DRIVERS_INTEL_MIPI_CAMERA
-	select SOC_INTEL_COMMON_BLOCK_IPU
-	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
+	select SOC_INTEL_COMMON_BLOCK_IPU
+	select SOC_INTEL_RAPTORLAKE
 
 config BOARD_GOOGLE_GLADIOS
 	bool "->  Gladios"
 	select BOARD_GOOGLE_BASEBOARD_BRASK
 	select CHROMEOS_WIFI_SAR if CHROMEOS
-	select SOC_INTEL_RAPTORLAKE
 	select DRIVERS_GENESYSLOGIC_GL9763E
 	select DRIVERS_GENESYSLOGIC_GL9750
 	select INTEL_GMA_HAVE_VBT
+	select SOC_INTEL_RAPTORLAKE
 
 config BOARD_GOOGLE_MARASOV
 	bool "->  Marasov"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
-	select SOC_INTEL_RAPTORLAKE
 	select DRIVERS_INTEL_ISH
+	select SOC_INTEL_RAPTORLAKE
 	select USE_UNIFIED_AP_FIRMWARE_FOR_UFS_AND_NON_UFS
 
 config BOARD_GOOGLE_OMNIGUL
 	bool "->  Omnigul"
 	select BOARD_GOOGLE_BASEBOARD_BRYA
+	select CHROMEOS_WIFI_SAR if CHROMEOS
+	select DRIVERS_INTEL_ISH
 	select SOC_INTEL_RAPTORLAKE
 	select USE_UNIFIED_AP_FIRMWARE_FOR_UFS_AND_NON_UFS
-	select DRIVERS_INTEL_ISH
-	select CHROMEOS_WIFI_SAR if CHROMEOS
 
 config BOARD_GOOGLE_CONSTITUTION
 	bool "->  Constitution"
 	select BOARD_GOOGLE_BASEBOARD_BRASK
 	select CHROMEOS_WIFI_SAR if CHROMEOS
-	select SOC_INTEL_RAPTORLAKE
 	select MEMORY_SOLDERDOWN
+	select SOC_INTEL_RAPTORLAKE
 
 config BOARD_GOOGLE_AURASH
 	bool "->  Aurash"
@@ -401,10 +401,10 @@ config BOARD_GOOGLE_ULDREN
 config BOARD_GOOGLE_YAVILLA
 	bool "->  Yavilla"
 	select BOARD_GOOGLE_BASEBOARD_NISSA
+	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_GENERIC_GPIO_KEYS
 	select DRIVERS_INTEL_MIPI_CAMERA
 	select HAVE_WWAN_POWER_SEQUENCE
-	select CHROMEOS_WIFI_SAR if CHROMEOS
 
 config BOARD_GOOGLE_GOTHRAX
 	bool "->  Gothrax"