sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/{baytrail,broadwell} Fix building with refcode blobs

Browse Source 
Because the refcode blobs are not redistributable, refcode.c is not
build-tested. Commit 6271dd8459 (soc/intel/baytrail,broadwell: Use
resume_from_stage_cache()) broke building with refcode blobs. Fix a
variable redeclaration error by swapping the order of the code, and
use consistent names for the variables.

Change-Id: Ic8dda8d35086d977b536686e8c80b7961c37860c
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50134
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Angel Pons
2021-01-29 18:20:11 +01:00
parent ec99cd9112
commit 67df3ff800
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/soc/intel/baytrail/refcode.c
View File

@@ -19,6 +19,12 @@ static void ABI_X86 send_to_console(unsigned char b)
static efi_wrapper_entry_t load_reference_code(void)
{
if (resume_from_stage_cache()) {
struct prog prog;
stage_cache_load_stage(STAGE_REFCODE, &prog);
return prog_entry(&prog);
}
struct prog prog =
PROG_INIT(PROG_REFCODE, CONFIG_CBFS_PREFIX "/refcode");
struct rmod_stage_load refcode = {
@@ -26,12 +32,6 @@ static efi_wrapper_entry_t load_reference_code(void)
.prog = &prog,
};
if (resume_from_stage_cache()) {
struct prog refcode;
stage_cache_load_stage(STAGE_REFCODE, &refcode);
return prog_entry(&refcode);
}
if (prog_locate(&prog)) {
printk(BIOS_DEBUG, "Couldn't locate reference code.\n");
return NULL;

12
src/soc/intel/broadwell/refcode.c
View File

@@ -15,6 +15,12 @@
static pei_wrapper_entry_t load_reference_code(void)
{
if (resume_from_stage_cache()) {
struct prog prog;
stage_cache_load_stage(STAGE_REFCODE, &prog);
return prog_entry(&prog);
}
struct prog prog =
PROG_INIT(PROG_REFCODE, CONFIG_CBFS_PREFIX "/refcode");
struct rmod_stage_load refcode = {
@@ -22,12 +28,6 @@ static pei_wrapper_entry_t load_reference_code(void)
.prog = &prog,
};
if (resume_from_stage_cache()) {
struct prog refcode;
stage_cache_load_stage(STAGE_REFCODE, &refcode);
return prog_entry(&prog);
}
if (prog_locate(&prog)) {
printk(BIOS_DEBUG, "Couldn't locate reference code.\n");
return NULL;