[S] Change in coreboot[master]: Revert "Kconfig: Allow x86 to compress pre-ram stages if not run XIP"

[Martin L Roth (Code Review)]

Martin L Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/67287 )

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

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
Signed-off-by: Martin Roth 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67287
Reviewed-by: Paul Fagerburg 
Tested-by: build bot (Jenkins) 
---
M src/Kconfig
1 file changed, 21 insertions(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Fagerburg: Looks good to me, approved

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