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

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36613 )

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

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

Change-Id: Iac24d243c4bd4cb8c1db14a8e9fc43f508c2cd5d
Signed-off-by: Arthur Heymans 
---
M src/Kconfig
M src/arch/x86/Makefile.inc
2 files changed, 3 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/36613/1

diff --git a/src/Kconfig b/src/Kconfig
index 793927a..df86246 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -160,7 +160,7 @@

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
    # Default value set at the end of the file
    help
      Compress romstage and (if it exists) verstage with LZ4 to save flash
@@ -1217,7 +1217,7 @@
    default y if !UNCOMPRESSED_RAMSTAGE

config COMPRESS_PRERAM_STAGES
-	depends on !ARCH_X86
+	depends on NO_XIP_EARLY_STAGES
    default y

config INCLUDE_CONFIG_FILE
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 447fd57..db4f054 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -119,6 +119,7 @@
 ifeq ($(CONFIG_C_ENVIRONMENT_BOOTBLOCK),y)

bootblock-y += bootblock_crt0.S
+bootblock-y += memmove.c

ifeq ($(CONFIG_ARCH_BOOTBLOCK_X86_32),y)
 $(eval $(call early_x86_stage,bootblock,elf32-i386))