diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig
index c6c75ee400..1989640afd 100644
--- a/src/mainboard/google/storm/Kconfig
+++ b/src/mainboard/google/storm/Kconfig
@@ -29,7 +29,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVERS_I2C_WW_RING
 	select HAVE_HARD_RESET
 	select MAINBOARD_HAS_CHROMEOS
-	select RETURN_FROM_VERSTAGE
 	select SPI_FLASH
 	select SPI_FLASH_SPANSION
 	select SPI_FLASH_STMICRO
diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig
index 7f8937cf7c..ecc52e20f2 100644
--- a/src/soc/qualcomm/ipq806x/Kconfig
+++ b/src/soc/qualcomm/ipq806x/Kconfig
@@ -10,6 +10,8 @@ config SOC_QC_IPQ806X
 	select HAVE_UART_SPECIAL
 	select SPI_ATOMIC_SEQUENCING
 	select GENERIC_GPIO_LIB
+	select SEPARATE_VERSTAGE
+	select RETURN_FROM_VERSTAGE
 
 if SOC_QC_IPQ806X