[coreboot-gerrit] New patch to review for coreboot: drivers/intel/fsp2_0: Enable XIP romstage with loaded FSP-M

[Lee Leahy (leroy.p.leahy@intel.com)]

Lee Leahy (leroy.p.leahy at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15848

-gerrit

commit 6d0b80e8a8d5fc41f240007ecae6c2c02627dfea
Author: Lee Leahy <leroy.p.leahy at intel.com>
Date:   Thu Jul 21 11:16:39 2016 -0700

    drivers/intel/fsp2_0: Enable XIP romstage with loaded FSP-M
    
    Separate NO_XIP_EARLY_STAGES from loading FSP-M into cache-as-RAM.
    Quark executes romstage directly from the SPI flash part (in-place),
    but loads FSP-M into ESRAM.  This split occurs because ESRAM is too
    small to hold everything while debugging.
    
    Platforms executing FSP-M directly from the SPI flash need to select
    FSP_M_XIP.
    
    TEST=Build and run on Galileo Gen2.
    
    Change-Id: Ib5313ae96dcec101510e82438b1889d315569696
    Signed-off-by: Lee Leahy <leroy.p.leahy at intel.com>
---
 src/drivers/intel/fsp2_0/Kconfig       | 6 ++++++
 src/drivers/intel/fsp2_0/memory_init.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/drivers/intel/fsp2_0/Kconfig b/src/drivers/intel/fsp2_0/Kconfig
index 8c45e73..10c7cac 100644
--- a/src/drivers/intel/fsp2_0/Kconfig
+++ b/src/drivers/intel/fsp2_0/Kconfig
@@ -54,4 +54,10 @@ config FSP_S_FILE
 	help
 	  The path and filename of the Intel FSP-S binary for this platform.
 
+config FSP_M_XIP
+	bool "Is FSP-M XIP"
+	default n
+	help
+	  Select this value when FSP-M is execute-in-place.
+
 endif
diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c
index 9ec1951..9276f0c 100644
--- a/src/drivers/intel/fsp2_0/memory_init.c
+++ b/src/drivers/intel/fsp2_0/memory_init.c
@@ -311,7 +311,7 @@ enum fsp_status fsp_memory_init(bool s3wake)
 		_car_relocatable_data_end - _car_region_start, 0);
 	memranges_insert(&memmap, (uintptr_t)_program, _program_size, 0);
 
-	if (IS_ENABLED(CONFIG_NO_XIP_EARLY_STAGES))
+	if (!IS_ENABLED(CONFIG_FSP_M_XIP))
 		status = load_fspm_mem(&hdr, &file_data, &memmap);
 	else
 		status = load_fspm_xip(&hdr, &file_data);