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

security/vboot: Drop CAR_GLOBAL_MIGRATION support

Browse Source 
Change-Id: I9dee03da028b9111b685e325368815a86e444a47
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37028
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Arthur Heymans
2019-11-20 19:47:10 +01:00
committed by Patrick Georgi
parent 7255610d9f
commit 344e86bb3b
5 changed files with 26 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/security/vboot/vboot_loader.c
View File

@@ -13,8 +13,6 @@
* GNU General Public License for more details.
*/
#include <arch/early_variables.h>
#include <boot_device.h>
#include <cbfs.h>
#include <console/console.h>
#include <ec/google/chromeec/ec.h>
@@ -34,14 +32,14 @@ _Static_assert(!CONFIG(VBOOT_RETURN_FROM_VERSTAGE) ||
CONFIG(VBOOT_SEPARATE_VERSTAGE),
"return from verstage only makes sense for separate verstages");
int vboot_executed CAR_GLOBAL;
int vboot_executed;
void vboot_run_logic(void)
{
if (verification_should_run()) {
/* Note: this path is not used for VBOOT_RETURN_FROM_VERSTAGE */
verstage_main();
car_set_var(vboot_executed, 1);
vboot_executed = 1;
} else if (verstage_should_load()) {
struct cbfsf file;
struct prog verstage =
@@ -68,7 +66,7 @@ void vboot_run_logic(void)
if (!CONFIG(VBOOT_RETURN_FROM_VERSTAGE))
return;
car_set_var(vboot_executed, 1);
vboot_executed = 1;
}
}