diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index 732a9ea..f5cd257 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -59,6 +59,7 @@
 	def_bool n
 	select BOARD_GOOGLE_BRYA_COMMON
 	select BOARD_ROMSIZE_KB_32768
+	select CR50_RESET_CLEAR_EC_AP_IDLE_FLAG
 	select ENABLE_TCSS_DISPLAY_DETECTION if RUN_FSP_GOP
 	select HAVE_SLP_S0_GATE
 	select MEMORY_SODIMM if !BOARD_GOOGLE_CONSTITUTION
@@ -67,7 +68,6 @@
 	select RT8168_SET_LED_MODE
 	select SOC_INTEL_ALDERLAKE_PCH_P
 	select TPM_GOOGLE_CR50
-	select CR50_RESET_CLEAR_EC_AP_IDLE_FLAG
 
 config BOARD_GOOGLE_BASEBOARD_HADES
 	def_bool n
@@ -130,10 +130,10 @@
 	select BOARD_ROMSIZE_KB_16384
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_GPIO_KEYS
-	select INTEL_GMA_HAVE_VBT
+	select DRIVERS_GFX_GENERIC
 	select DRIVERS_INTEL_MIPI_CAMERA
 	select HAVE_WWAN_POWER_SEQUENCE
-	select DRIVERS_GFX_GENERIC
+	select INTEL_GMA_HAVE_VBT
 	select CHROMEOS_WIFI_SAR if CHROMEOS
 
 config BOARD_GOOGLE_AURASH
@@ -155,6 +155,7 @@
 
 config BOARD_GOOGLE_BRYA0
 	select BOARD_GOOGLE_BASEBOARD_BRYA
+	select DRIVERS_GENERIC_NAU8315
 	select DRIVERS_GENESYSLOGIC_GL9755
 	select DRIVERS_I2C_SX9324
 	select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
@@ -162,7 +163,6 @@
 	select SOC_INTEL_COMMON_BLOCK_IPU
 	select SOC_INTEL_CRASHLOG
 	select SOC_INTEL_RAPTORLAKE
-	select DRIVERS_GENERIC_NAU8315
 
 config BOARD_GOOGLE_BUJIA
 	select BOARD_GOOGLE_BASEBOARD_BRASK
@@ -397,11 +397,11 @@
 
 config BOARD_GOOGLE_REDRIX
 	select BOARD_GOOGLE_BASEBOARD_BRYA
-	select GOOGLE_DSM_CALIB 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_CALIB if VPD
 	select GOOGLE_DSM_PARAM_FILE_NAME if VPD
 	select INTEL_GMA_HAVE_VBT
 	select SOC_INTEL_COMMON_BLOCK_IPU
@@ -419,6 +419,7 @@
 
 config BOARD_GOOGLE_SKOLAS
 	select BOARD_GOOGLE_BASEBOARD_BRYA
+	select DRIVERS_GENERIC_NAU8315
 	select DRIVERS_GENESYSLOGIC_GL9755
 	select DRIVERS_INTEL_MIPI_CAMERA
 	select DRIVERS_I2C_SX9324
@@ -426,7 +427,6 @@
 	select INTEL_GMA_HAVE_VBT
 	select SOC_INTEL_COMMON_BLOCK_IPU
 	select SOC_INTEL_RAPTORLAKE
-	select DRIVERS_GENERIC_NAU8315
 
 config BOARD_GOOGLE_SKOLAS4ES
 	select BOARD_GOOGLE_BASEBOARD_BRYA
@@ -530,9 +530,9 @@
 	select CHROMEOS_WIFI_SAR if CHROMEOS
 	select DRIVERS_GENERIC_GPIO_KEYS
 	select DRIVERS_INTEL_MIPI_CAMERA
+	select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
 	select HAVE_WWAN_POWER_SEQUENCE
 	select INTEL_GMA_HAVE_VBT
-	select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
 
 config BOARD_GOOGLE_YAVISTA
 	select BOARD_GOOGLE_BASEBOARD_NISSA
@@ -574,61 +574,61 @@
 
 config DRIVER_TPM_I2C_BUS
 	hex
-	default 0x1 if BOARD_GOOGLE_BRYA0
-	default 0x1 if BOARD_GOOGLE_BRASK
-	default 0x1 if BOARD_GOOGLE_PRIMUS
-	default 0x1 if BOARD_GOOGLE_GIMBLE
-	default 0x3 if BOARD_GOOGLE_GIMBLE4ES
-	default 0x1 if BOARD_GOOGLE_REDRIX
-	default 0x3 if BOARD_GOOGLE_REDRIX4ES
-	default 0x1 if BOARD_GOOGLE_KANO
-	default 0x1 if BOARD_GOOGLE_TAEKO
-	default 0x3 if BOARD_GOOGLE_TAEKO4ES
-	default 0x1 if BOARD_GOOGLE_FELWINTER
+	default 0x3 if BOARD_GOOGLE_AGAH
 	default 0x1 if BOARD_GOOGLE_ANAHERA
 	default 0x3 if BOARD_GOOGLE_ANAHERA4ES
-	default 0x1 if BOARD_GOOGLE_VELL
-	default 0x1 if BOARD_GOOGLE_TANIKS
-	default 0x0 if BOARD_GOOGLE_NIVVIKS
-	default 0x0 if BOARD_GOOGLE_NEREID
-	default 0x3 if BOARD_GOOGLE_AGAH
-	default 0x1 if BOARD_GOOGLE_VOLMAR
+	default 0x0 if BOARD_GOOGLE_ANRAGGAR
+	default 0x1 if BOARD_GOOGLE_AURASH
 	default 0x1 if BOARD_GOOGLE_BANSHEE
-	default 0x1 if BOARD_GOOGLE_KINOX
+	default 0x1 if BOARD_GOOGLE_BRASK
+	default 0x1 if BOARD_GOOGLE_BRYA0
+	default 0x1 if BOARD_GOOGLE_BUJIA
+	default 0x1 if BOARD_GOOGLE_CONSTITUTION
 	default 0x0 if BOARD_GOOGLE_CRAASK
+	default 0x0 if BOARD_GOOGLE_CRAASKOV
 	default 0x1 if BOARD_GOOGLE_CROTA
-	default 0x1 if BOARD_GOOGLE_MOLI
-	default 0x1 if BOARD_GOOGLE_OSIRIS
-	default 0x1 if BOARD_GOOGLE_MITHRAX
+	default 0x1 if BOARD_GOOGLE_DOCHI
+	default 0x1 if BOARD_GOOGLE_FELWINTER
+	default 0x1 if BOARD_GOOGLE_GAELIN
+	default 0x1 if BOARD_GOOGLE_GIMBLE
+	default 0x3 if BOARD_GOOGLE_GIMBLE4ES
+	default 0x1 if BOARD_GOOGLE_GLADIOS
+	default 0x0 if BOARD_GOOGLE_GLASSWAY
+	default 0x0 if BOARD_GOOGLE_GOTHRAX
+	default 0x3 if BOARD_GOOGLE_HADES
+	default 0x0 if BOARD_GOOGLE_JOXER
+	default 0x1 if BOARD_GOOGLE_KANO
+	default 0x1 if BOARD_GOOGLE_KINOX
 	default 0x1 if BOARD_GOOGLE_KULDAX
+	default 0x1 if BOARD_GOOGLE_LISBON
+	default 0x1 if BOARD_GOOGLE_MARASOV
+	default 0x1 if BOARD_GOOGLE_MITHRAX
+	default 0x1 if BOARD_GOOGLE_MOLI
+	default 0x0 if BOARD_GOOGLE_NEREID
+	default 0x0 if BOARD_GOOGLE_NIVVIKS
+	default 0x1 if BOARD_GOOGLE_NOVA
+	default 0x1 if BOARD_GOOGLE_OMNIGUL
+	default 0x1 if BOARD_GOOGLE_OSIRIS
+	default 0x0 if BOARD_GOOGLE_PIRRHA
+	default 0x1 if BOARD_GOOGLE_PRIMUS
+	default 0x0 if BOARD_GOOGLE_PUJJO
+	default 0x0 if BOARD_GOOGLE_QUANDISO
+	default 0x1 if BOARD_GOOGLE_REDRIX
+	default 0x3 if BOARD_GOOGLE_REDRIX4ES
 	default 0x1 if BOARD_GOOGLE_SKOLAS
 	default 0x1 if BOARD_GOOGLE_SKOLAS4ES
-	default 0x0 if BOARD_GOOGLE_JOXER
-	default 0x0 if BOARD_GOOGLE_PUJJO
-	default 0x0 if BOARD_GOOGLE_XIVU
-	default 0x0 if BOARD_GOOGLE_YAVIKS
-	default 0x1 if BOARD_GOOGLE_ZYDRON
-	default 0x1 if BOARD_GOOGLE_LISBON
-	default 0x1 if BOARD_GOOGLE_GLADIOS
-	default 0x1 if BOARD_GOOGLE_MARASOV
-	default 0x1 if BOARD_GOOGLE_GAELIN
-	default 0x1 if BOARD_GOOGLE_OMNIGUL
-	default 0x1 if BOARD_GOOGLE_CONSTITUTION
-	default 0x1 if BOARD_GOOGLE_AURASH
-	default 0x3 if BOARD_GOOGLE_HADES
-	default 0x0 if BOARD_GOOGLE_YAVILLA
-	default 0x0 if BOARD_GOOGLE_ULDREN
-	default 0x0 if BOARD_GOOGLE_CRAASKOV
-	default 0x0 if BOARD_GOOGLE_GOTHRAX
-	default 0x0 if BOARD_GOOGLE_PIRRHA
-	default 0x1 if BOARD_GOOGLE_DOCHI
-	default 0x0 if BOARD_GOOGLE_QUANDISO
-	default 0x0 if BOARD_GOOGLE_ANRAGGAR
-	default 0x1 if BOARD_GOOGLE_XOL
-	default 0x0 if BOARD_GOOGLE_GLASSWAY
-	default 0x1 if BOARD_GOOGLE_NOVA
-	default 0x1 if BOARD_GOOGLE_BUJIA
+	default 0x1 if BOARD_GOOGLE_TAEKO
+	default 0x3 if BOARD_GOOGLE_TAEKO4ES
+	default 0x1 if BOARD_GOOGLE_TANIKS
 	default 0x0 if BOARD_GOOGLE_TIVVIKS
+	default 0x0 if BOARD_GOOGLE_ULDREN
+	default 0x1 if BOARD_GOOGLE_VELL
+	default 0x1 if BOARD_GOOGLE_VOLMAR
+	default 0x0 if BOARD_GOOGLE_XIVU
+	default 0x1 if BOARD_GOOGLE_XOL
+	default 0x0 if BOARD_GOOGLE_YAVIKS
+	default 0x0 if BOARD_GOOGLE_YAVILLA
+	default 0x1 if BOARD_GOOGLE_ZYDRON
 
 config DRIVER_TPM_I2C_ADDR
 	hex
@@ -660,124 +660,124 @@
 	default "Google_Nissa" if BOARD_GOOGLE_BASEBOARD_NISSA
 
 config MAINBOARD_PART_NUMBER
-	default "Brya" if BOARD_GOOGLE_BRYA0
-	default "Brask" if BOARD_GOOGLE_BRASK
-	default "Primus" if BOARD_GOOGLE_PRIMUS
-	default "Gimble" if BOARD_GOOGLE_GIMBLE
-	default "Gimble4ES" if BOARD_GOOGLE_GIMBLE4ES
-	default "Redrix" if BOARD_GOOGLE_REDRIX
-	default "Redrix4ES" if BOARD_GOOGLE_REDRIX4ES
-	default "Kano" if BOARD_GOOGLE_KANO
-	default "Taeko" if BOARD_GOOGLE_TAEKO
-	default "Taeko4ES" if BOARD_GOOGLE_TAEKO4ES
-	default "Felwinter" if BOARD_GOOGLE_FELWINTER
+	default "Agah" if BOARD_GOOGLE_AGAH
 	default "Anahera" if BOARD_GOOGLE_ANAHERA
 	default "Anahera4ES" if BOARD_GOOGLE_ANAHERA4ES
-	default "Vell" if BOARD_GOOGLE_VELL
-	default "Taniks" if BOARD_GOOGLE_TANIKS
-	default "Nivviks" if BOARD_GOOGLE_NIVVIKS
-	default "Nereid" if BOARD_GOOGLE_NEREID
-	default "Agah" if BOARD_GOOGLE_AGAH
-	default "Volmar" if BOARD_GOOGLE_VOLMAR
+	default "Anraggar" if BOARD_GOOGLE_ANRAGGAR
+	default "Aurash" if BOARD_GOOGLE_AURASH
 	default "Banshee" if BOARD_GOOGLE_BANSHEE
-	default "Crota" if BOARD_GOOGLE_CROTA
-	default "Moli" if BOARD_GOOGLE_MOLI
-	default "Kinox" if BOARD_GOOGLE_KINOX
+	default "Brask" if BOARD_GOOGLE_BRASK
+	default "Brya" if BOARD_GOOGLE_BRYA0
+	default "Bujia" if BOARD_GOOGLE_BUJIA
+	default "Constitution" if BOARD_GOOGLE_CONSTITUTION
 	default "Craask" if BOARD_GOOGLE_CRAASK
-	default "Osiris" if BOARD_GOOGLE_OSIRIS
-	default "Mithrax" if BOARD_GOOGLE_MITHRAX
+	default "Craaskov" if BOARD_GOOGLE_CRAASKOV
+	default "Crota" if BOARD_GOOGLE_CROTA
+	default "Dochi" if BOARD_GOOGLE_DOCHI
+	default "Felwinter" if BOARD_GOOGLE_FELWINTER
+	default "Gaelin" if BOARD_GOOGLE_GAELIN
+	default "Gimble" if BOARD_GOOGLE_GIMBLE
+	default "Gimble4ES" if BOARD_GOOGLE_GIMBLE4ES
+	default "Gladios" if BOARD_GOOGLE_GLADIOS
+	default "Glassway" if BOARD_GOOGLE_GLASSWAY
+	default "Gothrax" if BOARD_GOOGLE_GOTHRAX
+	default "Hades" if BOARD_GOOGLE_HADES
+	default "Joxer" if BOARD_GOOGLE_JOXER
+	default "Kano" if BOARD_GOOGLE_KANO
+	default "Kinox" if BOARD_GOOGLE_KINOX
 	default "Kuldax" if BOARD_GOOGLE_KULDAX
+	default "Lisbon" if BOARD_GOOGLE_LISBON
+	default "Marasov" if BOARD_GOOGLE_MARASOV
+	default "Mithrax" if BOARD_GOOGLE_MITHRAX
+	default "Moli" if BOARD_GOOGLE_MOLI
+	default "Nereid" if BOARD_GOOGLE_NEREID
+	default "Nivviks" if BOARD_GOOGLE_NIVVIKS
+	default "Nokris" if BOARD_GOOGLE_NOKRIS
+	default "Nova" if BOARD_GOOGLE_NOVA
+	default "Omnigul" if BOARD_GOOGLE_OMNIGUL
+	default "Osiris" if BOARD_GOOGLE_OSIRIS
+	default "Pirrha" if BOARD_GOOGLE_PIRRHA
+	default "Primus" if BOARD_GOOGLE_PRIMUS
+	default "Pujjo" if BOARD_GOOGLE_PUJJO
+	default "Quandiso" if BOARD_GOOGLE_QUANDISO
+	default "Redrix" if BOARD_GOOGLE_REDRIX
+	default "Redrix4ES" if BOARD_GOOGLE_REDRIX4ES
 	default "Skolas" if BOARD_GOOGLE_SKOLAS
 	default "Skolas4ES" if BOARD_GOOGLE_SKOLAS4ES
-	default "Joxer" if BOARD_GOOGLE_JOXER
-	default "Pujjo" if BOARD_GOOGLE_PUJJO
-	default "Xivu" if BOARD_GOOGLE_XIVU
-	default "Gaelin" if BOARD_GOOGLE_GAELIN
-	default "Yaviks" if BOARD_GOOGLE_YAVIKS
-	default "Lisbon" if BOARD_GOOGLE_LISBON
-	default "Zydron" if BOARD_GOOGLE_ZYDRON
-	default "Gladios" if BOARD_GOOGLE_GLADIOS
-	default "Marasov" if BOARD_GOOGLE_MARASOV
-	default "Omnigul" if BOARD_GOOGLE_OMNIGUL
-	default "Constitution" if BOARD_GOOGLE_CONSTITUTION
-	default "Aurash" if BOARD_GOOGLE_AURASH
-	default "Hades" if BOARD_GOOGLE_HADES
-	default "Uldren" if BOARD_GOOGLE_ULDREN
-	default "Yavilla" if BOARD_GOOGLE_YAVILLA
-	default "Gothrax" if BOARD_GOOGLE_GOTHRAX
-	default "Craaskov" if BOARD_GOOGLE_CRAASKOV
-	default "Pirrha" if BOARD_GOOGLE_PIRRHA
-	default "Quandiso" if BOARD_GOOGLE_QUANDISO
-	default "Nokris" if BOARD_GOOGLE_NOKRIS
-	default "Dochi" if BOARD_GOOGLE_DOCHI
-	default "Anraggar" if BOARD_GOOGLE_ANRAGGAR
-	default "Xol" if BOARD_GOOGLE_XOL
-	default "Glassway" if BOARD_GOOGLE_GLASSWAY
-	default "Nova" if BOARD_GOOGLE_NOVA
-	default "Bujia" if BOARD_GOOGLE_BUJIA
-	default "Tivviks" if BOARD_GOOGLE_TIVVIKS
-	default "Yavista" if BOARD_GOOGLE_YAVISTA
 	default "Sundance" if BOARD_GOOGLE_SUNDANCE
+	default "Taeko" if BOARD_GOOGLE_TAEKO
+	default "Taeko4ES" if BOARD_GOOGLE_TAEKO4ES
+	default "Taniks" if BOARD_GOOGLE_TANIKS
+	default "Tivviks" if BOARD_GOOGLE_TIVVIKS
+	default "Uldren" if BOARD_GOOGLE_ULDREN
+	default "Vell" if BOARD_GOOGLE_VELL
+	default "Volmar" if BOARD_GOOGLE_VOLMAR
+	default "Xivu" if BOARD_GOOGLE_XIVU
+	default "Xol" if BOARD_GOOGLE_XOL
+	default "Yaviks" if BOARD_GOOGLE_YAVIKS
+	default "Yavilla" if BOARD_GOOGLE_YAVILLA
+	default "Yavista" if BOARD_GOOGLE_YAVISTA
+	default "Zydron" if BOARD_GOOGLE_ZYDRON
 
 config VARIANT_DIR
-	default "brya0" if BOARD_GOOGLE_BRYA0
-	default "brask" if BOARD_GOOGLE_BRASK
-	default "primus" if BOARD_GOOGLE_PRIMUS
-	default "gimble" if BOARD_GOOGLE_GIMBLE
-	default "gimble4es" if BOARD_GOOGLE_GIMBLE4ES
-	default "redrix" if BOARD_GOOGLE_REDRIX
-	default "redrix4es" if BOARD_GOOGLE_REDRIX4ES
-	default "kano" if BOARD_GOOGLE_KANO
-	default "taeko" if BOARD_GOOGLE_TAEKO
-	default "taeko4es" if BOARD_GOOGLE_TAEKO4ES
-	default "felwinter" if BOARD_GOOGLE_FELWINTER
+	default "agah" if BOARD_GOOGLE_AGAH
 	default "anahera" if BOARD_GOOGLE_ANAHERA
 	default "anahera4es" if BOARD_GOOGLE_ANAHERA4ES
-	default "vell" if BOARD_GOOGLE_VELL
-	default "taniks" if BOARD_GOOGLE_TANIKS
-	default "nivviks" if BOARD_GOOGLE_NIVVIKS
-	default "nereid" if BOARD_GOOGLE_NEREID
-	default "agah" if BOARD_GOOGLE_AGAH
-	default "volmar" if BOARD_GOOGLE_VOLMAR
+	default "anraggar" if BOARD_GOOGLE_ANRAGGAR
+	default "aurash" if BOARD_GOOGLE_AURASH
 	default "banshee" if BOARD_GOOGLE_BANSHEE
-	default "crota" if BOARD_GOOGLE_CROTA
-	default "moli" if BOARD_GOOGLE_MOLI
-	default "kinox" if BOARD_GOOGLE_KINOX
+	default "brask" if BOARD_GOOGLE_BRASK
+	default "brya0" if BOARD_GOOGLE_BRYA0
+	default "bujia" if BOARD_GOOGLE_BUJIA
+	default "constitution" if BOARD_GOOGLE_CONSTITUTION
 	default "craask" if BOARD_GOOGLE_CRAASK
-	default "osiris" if BOARD_GOOGLE_OSIRIS
-	default "mithrax" if BOARD_GOOGLE_MITHRAX
+	default "craaskov" if BOARD_GOOGLE_CRAASKOV
+	default "crota" if BOARD_GOOGLE_CROTA
+	default "dochi" if BOARD_GOOGLE_DOCHI
+	default "felwinter" if BOARD_GOOGLE_FELWINTER
+	default "gaelin" if BOARD_GOOGLE_GAELIN
+	default "gimble" if BOARD_GOOGLE_GIMBLE
+	default "gimble4es" if BOARD_GOOGLE_GIMBLE4ES
+	default "gladios" if BOARD_GOOGLE_GLADIOS
+	default "glassway" if BOARD_GOOGLE_GLASSWAY
+	default "gothrax" if BOARD_GOOGLE_GOTHRAX
+	default "hades" if BOARD_GOOGLE_HADES
+	default "joxer" if BOARD_GOOGLE_JOXER
+	default "kano" if BOARD_GOOGLE_KANO
+	default "kinox" if BOARD_GOOGLE_KINOX
 	default "kuldax" if BOARD_GOOGLE_KULDAX
+	default "lisbon" if BOARD_GOOGLE_LISBON
+	default "marasov" if BOARD_GOOGLE_MARASOV
+	default "mithrax" if BOARD_GOOGLE_MITHRAX
+	default "moli" if BOARD_GOOGLE_MOLI
+	default "nereid" if BOARD_GOOGLE_NEREID
+	default "nivviks" if BOARD_GOOGLE_NIVVIKS
+	default "nivviks" if BOARD_GOOGLE_TIVVIKS
+	default "nokris" if BOARD_GOOGLE_NOKRIS
+	default "nova" if BOARD_GOOGLE_NOVA
+	default "omnigul" if BOARD_GOOGLE_OMNIGUL
+	default "osiris" if BOARD_GOOGLE_OSIRIS
+	default "pirrha" if BOARD_GOOGLE_PIRRHA
+	default "primus" if BOARD_GOOGLE_PRIMUS
+	default "pujjo" if BOARD_GOOGLE_PUJJO
+	default "quandiso" if BOARD_GOOGLE_QUANDISO
+	default "redrix" if BOARD_GOOGLE_REDRIX
+	default "redrix4es" if BOARD_GOOGLE_REDRIX4ES
 	default "skolas" if BOARD_GOOGLE_SKOLAS
 	default "skolas4es" if BOARD_GOOGLE_SKOLAS4ES
-	default "joxer" if BOARD_GOOGLE_JOXER
-	default "pujjo" if BOARD_GOOGLE_PUJJO
-	default "xivu" if BOARD_GOOGLE_XIVU
-	default "gaelin" if BOARD_GOOGLE_GAELIN
-	default "yaviks" if BOARD_GOOGLE_YAVIKS
-	default "lisbon" if BOARD_GOOGLE_LISBON
-	default "zydron" if BOARD_GOOGLE_ZYDRON
-	default "gladios" if BOARD_GOOGLE_GLADIOS
-	default "marasov" if BOARD_GOOGLE_MARASOV
-	default "omnigul" if BOARD_GOOGLE_OMNIGUL
-	default "constitution" if BOARD_GOOGLE_CONSTITUTION
-	default "aurash" if BOARD_GOOGLE_AURASH
-	default "hades" if BOARD_GOOGLE_HADES
-	default "uldren" if BOARD_GOOGLE_ULDREN
-	default "yavilla" if BOARD_GOOGLE_YAVILLA
-	default "gothrax" if BOARD_GOOGLE_GOTHRAX
-	default "craaskov" if BOARD_GOOGLE_CRAASKOV
-	default "pirrha" if BOARD_GOOGLE_PIRRHA
-	default "quandiso" if BOARD_GOOGLE_QUANDISO
-	default "nokris" if BOARD_GOOGLE_NOKRIS
-	default "dochi" if BOARD_GOOGLE_DOCHI
-	default "anraggar" if BOARD_GOOGLE_ANRAGGAR
-	default "xol" if BOARD_GOOGLE_XOL
-	default "glassway" if BOARD_GOOGLE_GLASSWAY
-	default "nova" if BOARD_GOOGLE_NOVA
-	default "bujia" if BOARD_GOOGLE_BUJIA
-	default "nivviks" if BOARD_GOOGLE_TIVVIKS
-	default "yavista" if BOARD_GOOGLE_YAVISTA
 	default "sundance" if BOARD_GOOGLE_SUNDANCE
+	default "taeko" if BOARD_GOOGLE_TAEKO
+	default "taeko4es" if BOARD_GOOGLE_TAEKO4ES
+	default "taniks" if BOARD_GOOGLE_TANIKS
+	default "uldren" if BOARD_GOOGLE_ULDREN
+	default "vell" if BOARD_GOOGLE_VELL
+	default "volmar" if BOARD_GOOGLE_VOLMAR
+	default "xivu" if BOARD_GOOGLE_XIVU
+	default "xol" if BOARD_GOOGLE_XOL
+	default "yaviks" if BOARD_GOOGLE_YAVIKS
+	default "yavilla" if BOARD_GOOGLE_YAVILLA
+	default "zydron" if BOARD_GOOGLE_ZYDRON
+	default "yavista" if BOARD_GOOGLE_YAVISTA
 
 config VBOOT
 	select VBOOT_EARLY_EC_SYNC if !BOARD_GOOGLE_BASEBOARD_NISSA