diff --git a/src/mainboard/google/corsola/Kconfig b/src/mainboard/google/corsola/Kconfig
index cd2ae8f062..69b2f1fbbb 100644
--- a/src/mainboard/google/corsola/Kconfig
+++ b/src/mainboard/google/corsola/Kconfig
@@ -3,6 +3,27 @@
 # Umbrella option to be selected by variant boards.
 config BOARD_GOOGLE_CORSOLA_COMMON
 	def_bool n
+	select SOC_MEDIATEK_MT8186
+	select BOARD_ROMSIZE_KB_8192
+	select MAINBOARD_HAS_CHROMEOS
+	select CHROMEOS_USE_EC_WATCHDOG_FLAG if CHROMEOS
+	select COMMON_CBFS_SPI_WRAPPER
+	select SPI_FLASH
+	select SPI_FLASH_INCLUDE_ALL_DRIVERS
+	select COMMONLIB_STORAGE
+	select COMMONLIB_STORAGE_MMC
+	select EC_GOOGLE_CHROMEEC
+	select EC_GOOGLE_CHROMEEC_BOARDID
+	select EC_GOOGLE_CHROMEEC_SKUID
+	select EC_GOOGLE_CHROMEEC_SPI
+	select SPI_TPM if VBOOT
+	select TPM_GOOGLE_TI50 if VBOOT
+	select MAINBOARD_HAS_TPM2 if VBOOT
+	select MAINBOARD_HAS_NATIVE_VGA_INIT
+	select HAVE_LINEAR_FRAMEBUFFER
+	select DRIVER_ANALOGIX_ANX7625
+	select DRIVER_PARADE_PS8640
+	select RTC
 
 config BOARD_GOOGLE_KINGLER_COMMON
 	def_bool n
@@ -48,30 +69,6 @@ config VBOOT
 	select EC_GOOGLE_CHROMEEC_SWITCHES
 	select VBOOT_VBNV_FLASH
 
-config BOARD_SPECIFIC_OPTIONS
-	def_bool y
-	select SOC_MEDIATEK_MT8186
-	select BOARD_ROMSIZE_KB_8192
-	select MAINBOARD_HAS_CHROMEOS
-	select CHROMEOS_USE_EC_WATCHDOG_FLAG if CHROMEOS
-	select COMMON_CBFS_SPI_WRAPPER
-	select SPI_FLASH
-	select SPI_FLASH_INCLUDE_ALL_DRIVERS
-	select COMMONLIB_STORAGE
-	select COMMONLIB_STORAGE_MMC
-	select EC_GOOGLE_CHROMEEC
-	select EC_GOOGLE_CHROMEEC_BOARDID
-	select EC_GOOGLE_CHROMEEC_SKUID
-	select EC_GOOGLE_CHROMEEC_SPI
-	select SPI_TPM if VBOOT
-	select TPM_GOOGLE_TI50 if VBOOT
-	select MAINBOARD_HAS_TPM2 if VBOOT
-	select MAINBOARD_HAS_NATIVE_VGA_INIT
-	select HAVE_LINEAR_FRAMEBUFFER
-	select DRIVER_ANALOGIX_ANX7625
-	select DRIVER_PARADE_PS8640
-	select RTC
-
 config MAINBOARD_DIR
 	string
 	default "google/corsola"