Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10638
-gerrit
commit d324a35c2358e99fc7e1dcef3ad32590e89b750c Author: Patrick Georgi pgeorgi@google.com Date: Mon Jun 22 22:26:45 2015 +0200
intel/broadwell: Fix refcode handling
Allow adding and executing a refcode binary.
Change-Id: I00e91a088a5695b42528e246d0ed642d988603e3 Signed-off-by: Patrick Georgi pgeorgi@google.com --- src/soc/intel/broadwell/Kconfig | 18 ++++++++++++++++++ src/soc/intel/broadwell/refcode.c | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig index 1ef386b..965fd31 100644 --- a/src/soc/intel/broadwell/Kconfig +++ b/src/soc/intel/broadwell/Kconfig @@ -201,6 +201,24 @@ config SERIRQ_CONTINUOUS_MODE help If you set this option to y, the serial IRQ machine will be operated in continuous mode. + +config HAVE_REFCODE_BLOB + depends on ARCH_X86 + bool "An external reference code blob should be put into cbfs." + default n + help + The reference code blob will be placed into cbfs. + +if HAVE_REFCODE_BLOB + +config REFCODE_BLOB_FILE + string "Path and filename to reference code blob." + default "refcode.elf" + help + The path and filename to the file to be added to cbfs. + +endif # HAVE_REFCODE_BLOB + config HAVE_ME_BIN bool "Add Intel Management Engine firmware" default y diff --git a/src/soc/intel/broadwell/refcode.c b/src/soc/intel/broadwell/refcode.c index a890e82..949b416 100644 --- a/src/soc/intel/broadwell/refcode.c +++ b/src/soc/intel/broadwell/refcode.c @@ -43,7 +43,7 @@ static pei_wrapper_entry_t load_refcode_from_cache(void) return (pei_wrapper_entry_t)prog_entry(&refcode); }
-static efi_wrapper_entry_t load_reference_code(void) +static pei_wrapper_entry_t load_reference_code(void) { struct prog prog = PROG_INIT(ASSET_REFCODE, CONFIG_CBFS_PREFIX "/refcode"); @@ -69,7 +69,7 @@ static efi_wrapper_entry_t load_reference_code(void) /* Cache loaded reference code. */ stage_cache_add(STAGE_REFCODE, &prog);
- return prog_entry(&prog); + return (pei_wrapper_entry_t)prog_entry(&prog); }
void broadwell_run_reference_code(void)