summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2016-05-09 11:53:34 -0700
committerFurquan Shaikh <furquan@google.com>2016-05-11 18:38:13 +0200
commit61c1a05c07be4a7805a0595475cba3b9e8386b77 (patch)
tree889ac16488fb8f058cccffb43e86afae3706c0b0 /src
parent03f50720dfe168f5db9cb0324e4963b68ea99204 (diff)
downloadcoreboot-61c1a05c07be4a7805a0595475cba3b9e8386b77.tar.xz
util/cbfstool: Allow xip/non-xip relocation for FSP component
Currently, convert_fsp assumes that the component is always XIP. This is no longer true with FSP 2.0 and Apollolake platform. Thus, add the option -y|--xip for FSP which will allow the caller to mention whether the FSP component being added is XIP or not. Add this option to Makefiles of current FSP drivers (fsp1_0 and fsp1_1). Change-Id: I1e41d0902bb32afaf116bb457dd9265a5bcd8779 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/14748 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src')
-rw-r--r--src/drivers/intel/fsp1_0/Makefile.inc1
-rw-r--r--src/drivers/intel/fsp1_1/Makefile.inc1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/drivers/intel/fsp1_0/Makefile.inc b/src/drivers/intel/fsp1_0/Makefile.inc
index 4ff10687aa..67741a927a 100644
--- a/src/drivers/intel/fsp1_0/Makefile.inc
+++ b/src/drivers/intel/fsp1_0/Makefile.inc
@@ -30,6 +30,7 @@ cbfs-files-y += fsp.bin
fsp.bin-file := $(call strip_quotes,$(CONFIG_FSP_FILE))
fsp.bin-position := $(CONFIG_FSP_LOC)
fsp.bin-type := fsp
+fsp.bin-options := --xip
endif
ifeq ($(CONFIG_ENABLE_MRC_CACHE),y)
diff --git a/src/drivers/intel/fsp1_1/Makefile.inc b/src/drivers/intel/fsp1_1/Makefile.inc
index 3f214cb4bf..011df679f4 100644
--- a/src/drivers/intel/fsp1_1/Makefile.inc
+++ b/src/drivers/intel/fsp1_1/Makefile.inc
@@ -54,6 +54,7 @@ cbfs-files-y += fsp.bin
fsp.bin-file := $(call strip_quotes,$(CONFIG_FSP_FILE))
fsp.bin-position := $(CONFIG_FSP_LOC)
fsp.bin-type := fsp
+fsp.bin-options := --xip
endif
endif