Attention is currently required from: Sean Rhodes, Marshall Dawson, Paul Fagerburg, Julius Werner, Arthur Heymans.

Martin L Roth would like build bot (Jenkins), Sean Rhodes, Marshall Dawson, Paul Fagerburg, Julius Werner and Arthur Heymans to review this change.

View Change

Revert "Kconfig: Allow x86 to compress pre-ram stages if not run XIP"

This reverts commit 6317aff5b3028ad44b7885b6b63263c55b5aadb3.

Reason for revert: fix broken tot master

Change-Id: Ie8075cf6c80448bfc957a1e1183f0283d2011b1b
---
M src/Kconfig
1 file changed, 17 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/67287/1

diff --git a/src/Kconfig b/src/Kconfig
index 38126fa..0d3879e 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -173,14 +173,14 @@
 
 config COMPRESS_PRERAM_STAGES
 	bool "Compress romstage and verstage with LZ4"
-	depends on (HAVE_ROMSTAGE || HAVE_VERSTAGE) && NO_XIP_EARLY_STAGES
+	depends on !ARCH_X86 && (HAVE_ROMSTAGE || HAVE_VERSTAGE)
 	# 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 for obvious
-	  reasons.
+	  time spent decompressing. Doesn't work for XIP stages (assume all
+	  ARCH_X86 for now) for obvious reasons.
 
 config COMPRESS_BOOTBLOCK
 	bool
@@ -1370,7 +1370,7 @@
 	default y if !UNCOMPRESSED_RAMSTAGE
 
 config COMPRESS_PRERAM_STAGES
-	depends on (HAVE_ROMSTAGE || HAVE_VERSTAGE) && NO_XIP_EARLY_STAGES
+	depends on !ARCH_X86
 	default y
 
 config INCLUDE_CONFIG_FILE

To view, visit change 67287. To unsubscribe, or for help writing mail filters, visit settings.