[coreboot-gerrit] New patch to review for coreboot: soc/intel/apollolake: Relocate FSP-M during insertion in CBFS

[Andrey Petrov (andrey.petrov@intel.com)]

Andrey Petrov (andrey.petrov at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14866

-gerrit

commit 31ff494496f2d99ee6401313f3b4f3db7cbfa113
Author: Andrey Petrov <andrey.petrov at intel.com>
Date:   Tue May 17 00:03:27 2016 -0700

    soc/intel/apollolake: Relocate FSP-M during insertion in CBFS
    
    Since FSP-M is ran in CAR (as opposed to XIP), its default link
    address may need to be changed. Since cbfstool can relocate FSP
    blobs, take advantage of that feature.
    
    Change-Id: I4353fe09d785c090843ce25ff4e654d45c64c381
    Signed-off-by: Andrey Petrov <andrey.petrov at intel.com>
---
 src/soc/intel/apollolake/Kconfig      | 6 ++++++
 src/soc/intel/apollolake/Makefile.inc | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 41a96c9..136f7a5 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -122,4 +122,10 @@ config CACHE_MRC_SETTINGS
 	bool
 	default y
 
+config FSP_M_ADDR
+	hex
+	default 0xfef60000
+	help
+	  The address FSP-M will be relocated to during build time
+
 endif
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 240d3c2..63732b1 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -60,4 +60,7 @@ postcar-y += tsc_freq.c
 
 CPPFLAGS_common += -I$(src)/soc/intel/apollolake/include
 
+# Since FSP-M runs in CAR we need to relocate it to a specific address
+$(CONFIG_FSP_M_CBFS)-options := -b $(CONFIG_FSP_M_ADDR)
+
 endif