diff --git a/src/Kconfig b/src/Kconfig
index c1afe26..b33ea62 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -179,14 +179,14 @@
 
 config COMPRESS_PRERAM_STAGES
 	bool "Compress romstage and verstage with LZ4"
-	depends on !ARCH_X86 && (HAVE_ROMSTAGE || HAVE_VERSTAGE)
+	depends on (HAVE_ROMSTAGE || HAVE_VERSTAGE) && NO_XIP_EARLY_STAGES
 	# Default value set at the end of the file
 	help
 	  Compress romstage and (if it exists) verstage with LZ4 to save flash
 	  space and speed up boot, since the time for reading the image from SPI
 	  (and in the vboot case verifying it) is usually much greater than the
-	  time spent decompressing. Doesn't work for XIP stages (assume all
-	  ARCH_X86 for now) for obvious reasons.
+	  time spent decompressing. Doesn't work for XIP stages for obvious
+	  reasons.
 
 config COMPRESS_BOOTBLOCK
 	bool
@@ -1376,7 +1376,7 @@
 	default y if !UNCOMPRESSED_RAMSTAGE
 
 config COMPRESS_PRERAM_STAGES
-	depends on !ARCH_X86
+	depends on (HAVE_ROMSTAGE || HAVE_VERSTAGE) && NO_XIP_EARLY_STAGES
 	default y
 
 config INCLUDE_CONFIG_FILE