diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-05-12 16:45:56 -0500 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2015-05-13 00:23:42 +0200 |
| commit | 797ca1b71217675a1fcdde108b486e74632059a3 (patch) | |
| tree | 074dfd74f3bfe2e5640555426d64deaf4ce326b9 /src/soc/intel | |
| parent | 09560facd4a599afbc8f2ed47f48a97aabf40579 (diff) | |
| download | coreboot-797ca1b71217675a1fcdde108b486e74632059a3.tar.xz | |
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>
Reviewed-on: http://review.coreboot.org/10185
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/soc/intel')
| -rw-r--r-- | src/soc/intel/baytrail/refcode.c | 2 | ||||
| -rw-r--r-- | 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 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; |