Aaron Durbin (adurbin@chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10185
-gerrit
commit 935c8394ca8e71c2fab4cfda47031c14cf150b3a Author: Aaron Durbin adurbin@chromium.org Date: Tue May 12 16:45:56 2015 -0500
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 adurbin@chromium.org --- src/soc/intel/baytrail/refcode.c | 2 +- src/soc/intel/broadwell/refcode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/soc/intel/baytrail/refcode.c b/src/soc/intel/baytrail/refcode.c index 558db3c..29a6461 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 201825a..0eb2ef3 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;