diff --git a/src/cpu/amd/model_gx2/Kconfig b/src/cpu/amd/model_gx2/Kconfig
index 23c0ac75ea..4515a71c37 100644
--- a/src/cpu/amd/model_gx2/Kconfig
+++ b/src/cpu/amd/model_gx2/Kconfig
@@ -20,25 +20,27 @@
 config CPU_AMD_GX2
 	bool
 
+if CPU_AMD_GX2
+
+config CPU_SPECIFIC_OPTIONS
+	def_bool y
+	select CACHE_AS_RAM
+
 config DCACHE_RAM_BASE
 	hex
 	default 0xc8000
-	depends on CPU_AMD_GX2
 
 config DCACHE_RAM_SIZE
 	hex
 	default 0x04000
-	depends on CPU_AMD_GX2
 
 config GEODE_VSA
 	bool
 	default y
-	depends on CPU_AMD_GX2
 	select PCI_OPTION_ROM_RUN_REALMODE
 
 config GEODE_VSA_FILE
 	bool "Add a VSA image"
-	depends on CPU_AMD_GX2
 	help
 	  Select this option if you have an AMD Geode GX2 vsa that you would
 	  like to add to your ROM.
@@ -48,9 +50,10 @@ config GEODE_VSA_FILE
 
 config VSA_FILENAME
 	string "AMD Geode GX2 VSA path and filename"
-	depends on GEODE_VSA_FILE && CPU_AMD_GX2
+	depends on GEODE_VSA_FILE
 	default "gpl_vsa_gx_102.bin"
 	help
 	  The path and filename of the file to use as VSA.
 
+endif # CPU_AMD_GX2
 
diff --git a/src/mainboard/wyse/s50/Kconfig b/src/mainboard/wyse/s50/Kconfig
index 74efdf77bd..75b5335717 100644
--- a/src/mainboard/wyse/s50/Kconfig
+++ b/src/mainboard/wyse/s50/Kconfig
@@ -25,7 +25,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5536
 	select UDELAY_TSC
-	select CACHE_AS_RAM
 	select HAVE_PIRQ_TABLE
 	select PIRQ_ROUTE
 	select BOARD_ROMSIZE_KB_256