From cee4ff5aa4d017ac8a294d19d7c5985a9ae596b4 Mon Sep 17 00:00:00 2001 From: Andrey Petrov Date: Tue, 17 May 2016 00:03:27 -0700 Subject: [PATCH] UPSTREAM: soc/intel/apollolake: Relocate FSP-M during insertion in CBFS Since FSP-M is run 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. BUG=None BRANCH=None TEST=None Change-Id: I4353fe09d785c090843ce25ff4e654d45c64c381 Original-Signed-off-by: Andrey Petrov Original-Reviewed-on: https://review.coreboot.org/14866 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Aaron Durbin Signed-off-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/346984 Commit-Ready: Martin Roth Tested-by: Martin Roth Reviewed-by: Martin Roth --- 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 5d936ae8b3..b893885ce0 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -124,4 +124,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 240d3c2a69..63732b1b80 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