2 files changed, 17 insertions, 17 deletions

diff --git a/src/mainboard/google/corsola/Kconfig b/src/mainboard/google/corsola/Kconfig
index 8c291ce279..7f60114fff 100644
--- a/src/mainboard/google/corsola/Kconfig
+++ b/src/mainboard/google/corsola/Kconfig
@@ -27,9 +27,9 @@ config BOARD_GOOGLE_STARYU_COMMON
 if BOARD_GOOGLE_CORSOLA_COMMON
 
 config CORSOLA_SDCARD_INIT
-	def_bool BOARD_GOOGLE_MAGIKARP || \
+	def_bool BOARD_GOOGLE_KINGLER_COMMON || \
+		 BOARD_GOOGLE_MAGIKARP || \
 		 BOARD_GOOGLE_TENTACRUEL || \
-		 BOARD_GOOGLE_KINGLER_COMMON || \
 		 BOARD_GOOGLE_WUGTRIO
 
 config BOARD_SPECIFIC_OPTIONS
@@ -82,19 +82,19 @@ config MAINBOARD_DIR
 
 config MAINBOARD_PART_NUMBER
 	string
+	default "Chinchou" if BOARD_GOOGLE_CHINCHOU
 	default "Kingler" if BOARD_GOOGLE_KINGLER
 	default "Krabby" if BOARD_GOOGLE_KRABBY
 	default "Kyogre" if BOARD_GOOGLE_KYOGRE
-	default "Steelix" if BOARD_GOOGLE_STEELIX
-	default "Tentacruel" if BOARD_GOOGLE_TENTACRUEL
 	default "Magikarp" if BOARD_GOOGLE_MAGIKARP
-	default "Voltorb" if BOARD_GOOGLE_VOLTORB
-	default "Starmie" if BOARD_GOOGLE_STARMIE
 	default "Ponyta" if BOARD_GOOGLE_PONYTA
-	default "Chinchou" if BOARD_GOOGLE_CHINCHOU
-	default "Wugtrio" if BOARD_GOOGLE_WUGTRIO
 	default "Skitty" if BOARD_GOOGLE_SKITTY
+	default "Starmie" if BOARD_GOOGLE_STARMIE
+	default "Steelix" if BOARD_GOOGLE_STEELIX
+	default "Tentacruel" if BOARD_GOOGLE_TENTACRUEL
 	default "Veluza" if BOARD_GOOGLE_VELUZA
+	default "Voltorb" if BOARD_GOOGLE_VOLTORB
+	default "Wugtrio" if BOARD_GOOGLE_WUGTRIO
 
 config BOOT_DEVICE_SPI_FLASH_BUS
 	int
diff --git a/src/mainboard/google/corsola/Kconfig.name b/src/mainboard/google/corsola/Kconfig.name
index cbe1928a6f..ace57d46b1 100644
--- a/src/mainboard/google/corsola/Kconfig.name
+++ b/src/mainboard/google/corsola/Kconfig.name
@@ -8,32 +8,32 @@ config BOARD_GOOGLE_KINGLER
 config BOARD_GOOGLE_KYOGRE
 	bool "->  Kyogre"
 
+config BOARD_GOOGLE_PONYTA
+	bool "->  Ponyta"
+
 config BOARD_GOOGLE_STEELIX
 	bool "->  Steelix"
 
 config BOARD_GOOGLE_VOLTORB
 	bool "->  Voltorb"
 
-config BOARD_GOOGLE_PONYTA
-	bool "->  Ponyta"
-
 comment "Krabby"
 
+config BOARD_GOOGLE_CHINCHOU
+	bool "->  Chinchou"
+
 config BOARD_GOOGLE_KRABBY
 	bool "->  Krabby"
 
-config BOARD_GOOGLE_TENTACRUEL
-	bool "->  Tentacruel"
-
 config BOARD_GOOGLE_MAGIKARP
 	bool "->  Magikarp"
 
-config BOARD_GOOGLE_CHINCHOU
-	bool "->  Chinchou"
-
 config BOARD_GOOGLE_SKITTY
 	bool "->  Skitty"
 
+config BOARD_GOOGLE_TENTACRUEL
+	bool "->  Tentacruel"
+
 config BOARD_GOOGLE_VELUZA
 	bool "->  Veluza"