[coreboot-gerrit] Change in coreboot[master]: drivers/intel/fsp2_0: Allow including FSPT at specified offset

[Michał Żygowski (Code Review)]

Michał Żygowski has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43398 )

Change subject: drivers/intel/fsp2_0: Allow including FSPT at specified offset
......................................................................

drivers/intel/fsp2_0: Allow including FSPT at specified offset

FSPT is executed by assembly code and is not being automatically
relocated, thus it must be at specified offset. Add options to
specify FSPT location in CBFS and user option to include FSPT.

Signed-off-by: Michał Żygowski 
Change-Id: I997c7465fd7ac56633c3e7e3fa5b95384dcf5ad2
---
M src/drivers/intel/fsp2_0/Kconfig
M src/drivers/intel/fsp2_0/Makefile.inc
2 files changed, 11 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/43398/1

diff --git a/src/drivers/intel/fsp2_0/Kconfig b/src/drivers/intel/fsp2_0/Kconfig
index 3caa04a..5d27f32 100644
--- a/src/drivers/intel/fsp2_0/Kconfig
+++ b/src/drivers/intel/fsp2_0/Kconfig
@@ -89,6 +89,14 @@
    help
      The path and filename of the Intel FSP-T binary for this platform.

+config FSP_T_CBFS_LOCATION
+	hex "Intel FSP-T Binary location in CBFS"
+	default 0xfffd1000
+	help
+	  Specify the location of FSP-T binary. FSP-T is executed early by
+	  assembly code and is not automatically relocated. The location must
+	  match the binary base address in FSP-T header.
+
 config FSP_M_FILE
    string "Intel FSP-M (memory init) binary path and filename" if !FSP_USE_REPO
    depends on ADD_FSP_BINARIES
@@ -104,7 +112,7 @@
      The path and filename of the Intel FSP-S binary for this platform.

config FSP_CAR
-	bool
+	bool "Use FSP to setup temporary memory"
    default n
    help
      Use FSP APIs to initialize & Tear Down the Cache-As-Ram
diff --git a/src/drivers/intel/fsp2_0/Makefile.inc b/src/drivers/intel/fsp2_0/Makefile.inc
index 278036a..a1758ea 100644
--- a/src/drivers/intel/fsp2_0/Makefile.inc
+++ b/src/drivers/intel/fsp2_0/Makefile.inc
@@ -42,8 +42,9 @@
 cbfs-files-$(CONFIG_FSP_CAR) += $(FSP_T_CBFS)
 $(FSP_T_CBFS)-file := $(call strip_quotes,$(CONFIG_FSP_T_FILE))
 $(FSP_T_CBFS)-type := fsp
+$(FSP_T_CBFS)-options := -b $(CONFIG_FSP_T_CBFS_LOCATION)
 ifeq ($(CONFIG_FSP_T_XIP),y)
-$(FSP_T_CBFS)-options := --xip $(TXTIBB) $(BTGIBB)
+$(FSP_T_CBFS)-options := --xip $(TXTIBB) $(BTGIBB) -b $(CONFIG_FSP_T_CBFS_LOCATION)
 endif

cbfs-files-$(CONFIG_ADD_FSP_BINARIES) += $(FSP_M_CBFS)