From 797ca1b71217675a1fcdde108b486e74632059a3 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 12 May 2015 16:45:56 -0500 Subject: baytrail: broadwell: correct refcode loading I messed up the conditionals on loading the reference code. The bug used || instead of && causing 2 reference codes to be loaded. Change-Id: I29a046bf0e8dc29a9efdb636ebfd04e11eb73f82 Signed-off-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/10185 Reviewed-by: Stefan Reinauer Tested-by: build bot (Jenkins) --- src/soc/intel/baytrail/refcode.c | 2 +- src/soc/intel/broadwell/refcode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/soc/intel/baytrail/refcode.c b/src/soc/intel/baytrail/refcode.c index 558db3cc8d..29a64617b5 100644 --- a/src/soc/intel/baytrail/refcode.c +++ b/src/soc/intel/baytrail/refcode.c @@ -112,7 +112,7 @@ static efi_wrapper_entry_t load_reference_code(void) return load_refcode_from_cache(); } - if (load_refcode_from_vboot(&refcode) || + if (load_refcode_from_vboot(&refcode) && load_refcode_from_cbfs(&refcode)) return NULL; diff --git a/src/soc/intel/broadwell/refcode.c b/src/soc/intel/broadwell/refcode.c index 201825a93b..0eb2ef3c14 100644 --- a/src/soc/intel/broadwell/refcode.c +++ b/src/soc/intel/broadwell/refcode.c @@ -108,7 +108,7 @@ static pei_wrapper_entry_t load_reference_code(void) return load_refcode_from_cache(); } - if (load_refcode_from_vboot(&refcode) || + if (load_refcode_from_vboot(&refcode) && load_refcode_from_cbfs(&refcode)) return NULL; -- cgit v1.2.3