diff --git a/src/soc/imgtec/pistachio/Kconfig b/src/soc/imgtec/pistachio/Kconfig
index 5092ba5386..f9d369a83a 100644
--- a/src/soc/imgtec/pistachio/Kconfig
+++ b/src/soc/imgtec/pistachio/Kconfig
@@ -29,6 +29,7 @@ config CPU_IMGTEC_PISTACHIO
 	select HAVE_UART_MEMORY_MAPPED
 	select HAVE_UART_SPECIAL
 	select SPI_ATOMIC_SEQUENCING
+	select GENERIC_GPIO_LIB
 	bool
 
 if CPU_IMGTEC_PISTACHIO
diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig
index d8e589d165..fb525a8ffa 100644
--- a/src/soc/marvell/bg4cd/Kconfig
+++ b/src/soc/marvell/bg4cd/Kconfig
@@ -32,6 +32,10 @@ config SOC_MARVELL_BG4CD
 	select HAVE_MONOTONIC_TIMER
 	select HAVE_UART_MEMORY_MAPPED
 	select HAVE_UART_SPECIAL
+	select GENERIC_GPIO_LIB
+	# RETURN_FROM_VERSTAGE is disabled because vboot2_verify_firmware is
+	# part of bootblock, so, verstage is called as a function instead of
+	# as a stage
 
 if SOC_MARVELL_BG4CD
 
diff --git a/src/soc/nvidia/tegra124/Kconfig b/src/soc/nvidia/tegra124/Kconfig
index c7e5ce362a..4fa16272d5 100644
--- a/src/soc/nvidia/tegra124/Kconfig
+++ b/src/soc/nvidia/tegra124/Kconfig
@@ -17,6 +17,7 @@ config SOC_NVIDIA_TEGRA124
 	select ARM_LPAE
 	select COLLECT_TIMESTAMPS
 	select HAS_PRECBMEM_TIMESTAMP_REGION
+	select GENERIC_GPIO_LIB
 
 if SOC_NVIDIA_TEGRA124
 
diff --git a/src/soc/nvidia/tegra132/Kconfig b/src/soc/nvidia/tegra132/Kconfig
index 9da73ea1e9..a16c9a3679 100644
--- a/src/soc/nvidia/tegra132/Kconfig
+++ b/src/soc/nvidia/tegra132/Kconfig
@@ -20,6 +20,7 @@ config SOC_NVIDIA_TEGRA132
 	select COLLECT_TIMESTAMPS
 	select HAS_PRECBMEM_TIMESTAMP_REGION
 	select CHROMEOS_RAMOOPS_NON_ACPI
+	select GENERIC_GPIO_LIB
 
 if SOC_NVIDIA_TEGRA132
 
diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig
index ea60632efb..eb840f0814 100644
--- a/src/soc/qualcomm/ipq806x/Kconfig
+++ b/src/soc/qualcomm/ipq806x/Kconfig
@@ -11,6 +11,7 @@ config SOC_QC_IPQ806X
 	select HAVE_UART_MEMORY_MAPPED
 	select HAVE_UART_SPECIAL
 	select SPI_ATOMIC_SEQUENCING
+	select GENERIC_GPIO_LIB
 
 if SOC_QC_IPQ806X
 
diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig
index 78f1f065ad..051a2e6fdb 100644
--- a/src/soc/rockchip/rk3288/Kconfig
+++ b/src/soc/rockchip/rk3288/Kconfig
@@ -33,6 +33,7 @@ config SOC_ROCKCHIP_RK3288
 	select HAVE_UART_MEMORY_MAPPED
 	select BOOTBLOCK_CONSOLE
 	select HAS_PRECBMEM_TIMESTAMP_REGION
+	select GENERIC_GPIO_LIB
 
 if SOC_ROCKCHIP_RK3288