diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 705bb71..0b7cd52 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -32,6 +32,9 @@
 config GENERIC_HARDIRQS
 	def_bool y
 
+config GENERIC_GPIO
+	def_bool y
+
 config ARCH_HAS_ILOG2_U32
 	def_bool n
 
@@ -69,6 +72,11 @@
 	select MMU
 	help
 	  This variant refers to Tensilica's Diamond 232L Standard core Rev.B (LE).
+
+config XTENSA_VARIANT_S6000
+	bool "s6000 - Stretch software configurable processor"
+	select VARIANT_IRQ_SWITCH
+	select ARCH_REQUIRE_GPIOLIB
 endchoice
 
 config XTENSA_UNALIGNED_USER