mb/google/dedede/Kconfig: Alphabetize variant board listings

Change-Id: I2909375d38c37332293bd7928ae33d5bb502694f
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80490
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

1 files changed, 139 insertions, 139 deletions

diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig
index 4bcc2e9261..a09f4f52c3 100644
--- a/src/mainboard/google/dedede/Kconfig
+++ b/src/mainboard/google/dedede/Kconfig
@@ -45,6 +45,20 @@ config BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
 	select MEMORY_MAPPED_TPM
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE
 
+config BOARD_GOOGLE_BEADRIX
+	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+	select BASEBOARD_DEDEDE_LAPTOP
+	select DRIVERS_GENERIC_MAX98357A
+	select DRIVERS_I2C_SX9324
+	select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_BLIPPER
+	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+	select BASEBOARD_DEDEDE_LAPTOP
+	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+	select INTEL_GMA_HAVE_VBT
+
 config BOARD_GOOGLE_BOTEN
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
@@ -53,114 +67,99 @@ config BOARD_GOOGLE_BOTEN
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_DIBBI
+config BOARD_GOOGLE_BOXY
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select INTEL_GMA_HAVE_VBT
 	select RT8168_GEN_ACPI_POWER_RESOURCE
 	select RT8168_GET_MAC_FROM_VPD
 	select RT8168_SET_LED_MODE
 
-config BOARD_GOOGLE_DEDEDE
-	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
-	select BASEBOARD_DEDEDE_LAPTOP
-	select BOARD_ROMSIZE_KB_32768
-
-config BOARD_GOOGLE_DRAWCIA
+config BOARD_GOOGLE_BUGZZY
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
 	select DRIVERS_GENERIC_MAX98357A
+	select DRIVERS_I2C_DA7219
+	select DRIVERS_I2C_SX9360
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
-	select DRIVERS_INTEL_MIPI_CAMERA
 	select INTEL_GMA_HAVE_VBT
-	select SOC_INTEL_COMMON_BLOCK_IPU
 
-config BOARD_GOOGLE_HABOKI
+config BOARD_GOOGLE_CAPPY2
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
 	select BASEBOARD_DEDEDE_LAPTOP
-	select DRIVERS_GENERIC_MAX98357A
-	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
-	select DRIVERS_INTEL_MIPI_CAMERA
-	select SOC_INTEL_COMMON_BLOCK_IPU
 
-config BOARD_GOOGLE_MADOO
-	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+config BOARD_GOOGLE_CORORI
+	select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
 	select BASEBOARD_DEDEDE_LAPTOP
 	select DRIVERS_GENERIC_MAX98357A
-	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
-	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_WADDLEDOO
+config BOARD_GOOGLE_CRET
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
-	select BOARD_ROMSIZE_KB_32768
 	select DRIVERS_GENERIC_MAX98357A
 	select DRIVERS_I2C_DA7219
-	select DRIVERS_INTEL_MIPI_CAMERA
+	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
-	select SOC_INTEL_COMMON_BLOCK_IPU
 
-config BOARD_GOOGLE_WADDLEDEE
+config BOARD_GOOGLE_DEDEDE
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
 	select BOARD_ROMSIZE_KB_32768
-	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_LALALA
-	select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
-	select BASEBOARD_DEDEDE_LAPTOP
-	select DRIVERS_INTEL_MIPI_CAMERA
+config BOARD_GOOGLE_DEXI
+	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+	select RT8168_GEN_ACPI_POWER_RESOURCE
+	select RT8168_GET_MAC_FROM_VPD
+	select RT8168_SET_LED_MODE
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
-	select SOC_INTEL_COMMON_BLOCK_IPU
 
-config BOARD_GOOGLE_MAGOLOR
+config BOARD_GOOGLE_DIBBI
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
-	select BASEBOARD_DEDEDE_LAPTOP
-	select DRIVERS_I2C_DA7219
-	select DRIVERS_INTEL_MIPI_CAMERA
-	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
-	select SOC_INTEL_COMMON_BLOCK_IPU
+	select RT8168_GEN_ACPI_POWER_RESOURCE
+	select RT8168_GET_MAC_FROM_VPD
+	select RT8168_SET_LED_MODE
 
-config BOARD_GOOGLE_METAKNIGHT
+config BOARD_GOOGLE_DITA
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
-	select BASEBOARD_DEDEDE_LAPTOP
-	select INTEL_GMA_HAVE_VBT
+	select RT8168_GEN_ACPI_POWER_RESOURCE
+	select RT8168_GET_MAC_FROM_VPD
+	select RT8168_SET_LED_MODE
+	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 
-config BOARD_GOOGLE_LANTIS
+config BOARD_GOOGLE_DRAWCIA
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
 	select DRIVERS_GENERIC_MAX98357A
+	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+	select DRIVERS_INTEL_MIPI_CAMERA
 	select INTEL_GMA_HAVE_VBT
+	select SOC_INTEL_COMMON_BLOCK_IPU
 
-config BOARD_GOOGLE_GALTIC
-	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+config BOARD_GOOGLE_DRIBLEE
+	select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
 	select BASEBOARD_DEDEDE_LAPTOP
-	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
-	select INTEL_GMA_HAVE_VBT
+	select DRIVERS_GENERIC_MAX98357A
 
-config BOARD_GOOGLE_SASUKE
+config BOARD_GOOGLE_GALTIC
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
-	select DRIVERS_GENERIC_MAX98357A
-	select DRIVERS_I2C_DA7219
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_STORO
-	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+config BOARD_GOOGLE_GOOEY
+	select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
 	select BASEBOARD_DEDEDE_LAPTOP
 	select DRIVERS_I2C_SX9324
 	select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
-	select DRIVERS_INTEL_MIPI_CAMERA
-	select SOC_INTEL_COMMON_BLOCK_IPU
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
-	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_SASUKETTE
-	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+config BOARD_GOOGLE_HABOKI
+	select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
 	select BASEBOARD_DEDEDE_LAPTOP
+	select DRIVERS_GENERIC_MAX98357A
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
-	select INTEL_GMA_HAVE_VBT
+	select DRIVERS_INTEL_MIPI_CAMERA
+	select SOC_INTEL_COMMON_BLOCK_IPU
 
 config BOARD_GOOGLE_KRACKO
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
@@ -171,67 +170,73 @@ config BOARD_GOOGLE_KRACKO
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_BLIPPER
-	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+config BOARD_GOOGLE_LALALA
+	select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
 	select BASEBOARD_DEDEDE_LAPTOP
+	select DRIVERS_INTEL_MIPI_CAMERA
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+	select SOC_INTEL_COMMON_BLOCK_IPU
+
+config BOARD_GOOGLE_LANTIS
+	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+	select BASEBOARD_DEDEDE_LAPTOP
+	select DRIVERS_GENERIC_MAX98357A
 	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_CRET
+config BOARD_GOOGLE_MADOO
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
 	select DRIVERS_GENERIC_MAX98357A
-	select DRIVERS_I2C_DA7219
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_PIRIKA
+config BOARD_GOOGLE_MAGOLOR
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
+	select DRIVERS_I2C_DA7219
+	select DRIVERS_INTEL_MIPI_CAMERA
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
+	select SOC_INTEL_COMMON_BLOCK_IPU
 
-config BOARD_GOOGLE_CAPPY2
-	select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
+config BOARD_GOOGLE_METAKNIGHT
+	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
+	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_BUGZZY
+config BOARD_GOOGLE_PIRIKA
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
-	select DRIVERS_GENERIC_MAX98357A
-	select DRIVERS_I2C_DA7219
-	select DRIVERS_I2C_SX9360
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_CORORI
-	select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
-	select BASEBOARD_DEDEDE_LAPTOP
-	select DRIVERS_GENERIC_MAX98357A
-
-config BOARD_GOOGLE_DRIBLEE
-	select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
+config BOARD_GOOGLE_SASUKE
+	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
 	select DRIVERS_GENERIC_MAX98357A
+	select DRIVERS_I2C_DA7219
+	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_GOOEY
-	select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
+config BOARD_GOOGLE_SASUKETTE
+	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
-	select DRIVERS_I2C_SX9324
-	select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_BEADRIX
+config BOARD_GOOGLE_SHOTZO
+	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+
+config BOARD_GOOGLE_STORO
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select BASEBOARD_DEDEDE_LAPTOP
-	select DRIVERS_GENERIC_MAX98357A
 	select DRIVERS_I2C_SX9324
 	select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
+	select DRIVERS_INTEL_MIPI_CAMERA
+	select SOC_INTEL_COMMON_BLOCK_IPU
+	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_SHOTZO
-	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
-
 config BOARD_GOOGLE_TARANZA
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
 	select RT8168_GEN_ACPI_POWER_RESOURCE
@@ -240,26 +245,21 @@ config BOARD_GOOGLE_TARANZA
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 	select INTEL_GMA_HAVE_VBT
 
-config BOARD_GOOGLE_BOXY
+config BOARD_GOOGLE_WADDLEDEE
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+	select BASEBOARD_DEDEDE_LAPTOP
+	select BOARD_ROMSIZE_KB_32768
 	select INTEL_GMA_HAVE_VBT
-	select RT8168_GEN_ACPI_POWER_RESOURCE
-	select RT8168_GET_MAC_FROM_VPD
-	select RT8168_SET_LED_MODE
 
-config BOARD_GOOGLE_DEXI
-	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
-	select RT8168_GEN_ACPI_POWER_RESOURCE
-	select RT8168_GET_MAC_FROM_VPD
-	select RT8168_SET_LED_MODE
-	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
-
-config BOARD_GOOGLE_DITA
+config BOARD_GOOGLE_WADDLEDOO
 	select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
-	select RT8168_GEN_ACPI_POWER_RESOURCE
-	select RT8168_GET_MAC_FROM_VPD
-	select RT8168_SET_LED_MODE
-	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+	select BASEBOARD_DEDEDE_LAPTOP
+	select BOARD_ROMSIZE_KB_32768
+	select DRIVERS_GENERIC_MAX98357A
+	select DRIVERS_I2C_DA7219
+	select DRIVERS_INTEL_MIPI_CAMERA
+	select INTEL_GMA_HAVE_VBT
+	select SOC_INTEL_COMMON_BLOCK_IPU
 
 if BOARD_GOOGLE_BASEBOARD_DEDEDE
 
@@ -304,37 +304,37 @@ config MAINBOARD_FAMILY
 	default "Google_Dedede" if BOARD_GOOGLE_DEDEDE
 
 config MAINBOARD_PART_NUMBER
+	default "Beadrix" if BOARD_GOOGLE_BEADRIX
+	default "Blipper" if BOARD_GOOGLE_BLIPPER
 	default "Boten" if BOARD_GOOGLE_BOTEN
-	default "Dibbi" if BOARD_GOOGLE_DIBBI
+	default "Boxy" if BOARD_GOOGLE_BOXY
+	default "Bugzzy" if BOARD_GOOGLE_BUGZZY
+	default "Cappy2" if BOARD_GOOGLE_CAPPY2
+	default "Corori" if BOARD_GOOGLE_CORORI
+	default "Cret" if BOARD_GOOGLE_CRET
 	default "Dedede" if BOARD_GOOGLE_DEDEDE
+	default "Dexi" if BOARD_GOOGLE_DEXI
+	default "Dibbi" if BOARD_GOOGLE_DIBBI
+	default "Dita" if BOARD_GOOGLE_DITA
 	default "Drawcia" if BOARD_GOOGLE_DRAWCIA
-	default "Madoo" if BOARD_GOOGLE_MADOO
-	default "Waddledoo" if BOARD_GOOGLE_WADDLEDOO
-	default "Waddledee" if BOARD_GOOGLE_WADDLEDEE
+	default "Driblee" if BOARD_GOOGLE_DRIBLEE
+	default "Galtic" if BOARD_GOOGLE_GALTIC
+	default "Gooey" if BOARD_GOOGLE_GOOEY
+	default "Haboki" if BOARD_GOOGLE_HABOKI
+	default "Kracko" if BOARD_GOOGLE_KRACKO
 	default "Lalala" if BOARD_GOOGLE_LALALA
+	default "Lantis" if BOARD_GOOGLE_LANTIS
+	default "Madoo" if BOARD_GOOGLE_MADOO
 	default "Magolor" if BOARD_GOOGLE_MAGOLOR
 	default "Metaknight" if BOARD_GOOGLE_METAKNIGHT
-	default "Lantis" if BOARD_GOOGLE_LANTIS
-	default "Galtic" if BOARD_GOOGLE_GALTIC
+	default "Pirika" if BOARD_GOOGLE_PIRIKA
 	default "Sasuke" if BOARD_GOOGLE_SASUKE
-	default "Storo" if BOARD_GOOGLE_STORO
 	default "Sasukette" if BOARD_GOOGLE_SASUKETTE
-	default "Kracko" if BOARD_GOOGLE_KRACKO
-	default "Blipper" if BOARD_GOOGLE_BLIPPER
-	default "Cret" if BOARD_GOOGLE_CRET
-	default "Pirika" if BOARD_GOOGLE_PIRIKA
-	default "Haboki" if BOARD_GOOGLE_HABOKI
-	default "Cappy2" if BOARD_GOOGLE_CAPPY2
-	default "Bugzzy" if BOARD_GOOGLE_BUGZZY
-	default "Corori" if BOARD_GOOGLE_CORORI
-	default "Driblee" if BOARD_GOOGLE_DRIBLEE
-	default "Gooey" if BOARD_GOOGLE_GOOEY
-	default "Beadrix" if BOARD_GOOGLE_BEADRIX
 	default "Shotzo" if BOARD_GOOGLE_SHOTZO
+	default "Storo" if BOARD_GOOGLE_STORO
 	default "Taranza" if BOARD_GOOGLE_TARANZA
-	default "Boxy" if BOARD_GOOGLE_BOXY
-	default "Dexi" if BOARD_GOOGLE_DEXI
-	default "Dita" if BOARD_GOOGLE_DITA
+	default "Waddledee" if BOARD_GOOGLE_WADDLEDEE
+	default "Waddledoo" if BOARD_GOOGLE_WADDLEDOO
 
 config MAX_CPUS
 	int
@@ -348,37 +348,37 @@ config UART_FOR_CONSOLE
 	default 2
 
 config VARIANT_DIR
+	default "beadrix" if BOARD_GOOGLE_BEADRIX
+	default "blipper" if BOARD_GOOGLE_BLIPPER
 	default "boten" if BOARD_GOOGLE_BOTEN
-	default "dibbi" if BOARD_GOOGLE_DIBBI
+	default "boxy" if BOARD_GOOGLE_BOXY
+	default "bugzzy" if BOARD_GOOGLE_BUGZZY
+	default "cappy2" if BOARD_GOOGLE_CAPPY2
+	default "corori" if BOARD_GOOGLE_CORORI
+	default "cret" if BOARD_GOOGLE_CRET
 	default "dedede" if BOARD_GOOGLE_DEDEDE
+	default "dexi" if BOARD_GOOGLE_DEXI
+	default "dibbi" if BOARD_GOOGLE_DIBBI
+	default "dita" if BOARD_GOOGLE_DITA
 	default "drawcia" if BOARD_GOOGLE_DRAWCIA
-	default "madoo" if BOARD_GOOGLE_MADOO
-	default "waddledoo" if BOARD_GOOGLE_WADDLEDOO
-	default "waddledee" if BOARD_GOOGLE_WADDLEDEE
+	default "driblee" if BOARD_GOOGLE_DRIBLEE
+	default "galtic" if BOARD_GOOGLE_GALTIC
+	default "gooey" if BOARD_GOOGLE_GOOEY
+	default "haboki" if BOARD_GOOGLE_HABOKI
+	default "kracko" if BOARD_GOOGLE_KRACKO
 	default "lalala" if BOARD_GOOGLE_LALALA
+	default "lantis" if BOARD_GOOGLE_LANTIS
+	default "madoo" if BOARD_GOOGLE_MADOO
 	default "magolor" if BOARD_GOOGLE_MAGOLOR
 	default "metaknight" if BOARD_GOOGLE_METAKNIGHT
-	default "lantis" if BOARD_GOOGLE_LANTIS
-	default "galtic" if BOARD_GOOGLE_GALTIC
+	default "pirika" if BOARD_GOOGLE_PIRIKA
 	default "sasuke" if BOARD_GOOGLE_SASUKE
-	default "storo" if BOARD_GOOGLE_STORO
 	default "sasukette" if BOARD_GOOGLE_SASUKETTE
-	default "kracko" if BOARD_GOOGLE_KRACKO
-	default "blipper" if BOARD_GOOGLE_BLIPPER
-	default "cret" if BOARD_GOOGLE_CRET
-	default "pirika" if BOARD_GOOGLE_PIRIKA
-	default "haboki" if BOARD_GOOGLE_HABOKI
-	default "cappy2" if BOARD_GOOGLE_CAPPY2
-	default "bugzzy" if BOARD_GOOGLE_BUGZZY
-	default "corori" if BOARD_GOOGLE_CORORI
-	default "driblee" if BOARD_GOOGLE_DRIBLEE
-	default "gooey" if BOARD_GOOGLE_GOOEY
-	default "beadrix" if BOARD_GOOGLE_BEADRIX
 	default "shotzo" if BOARD_GOOGLE_SHOTZO
+	default "storo" if BOARD_GOOGLE_STORO
 	default "taranza" if BOARD_GOOGLE_TARANZA
-	default "boxy" if BOARD_GOOGLE_BOXY
-	default "dexi" if BOARD_GOOGLE_DEXI
-	default "dita" if BOARD_GOOGLE_DITA
+	default "waddledee" if BOARD_GOOGLE_WADDLEDEE
+	default "waddledoo" if BOARD_GOOGLE_WADDLEDOO
 
 endif #BOARD_GOOGLE_BASEBOARD_DEDEDE