summaryrefslogtreecommitdiff
path: root/src/security/vboot/vboot_loader.c
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2019-11-20 19:47:10 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-11-29 09:05:04 +0000
commit344e86bb3baff8f89c1335c190dbee050176e058 (patch)
tree31d3d610d0cd1b5bad9f96d8513f896b3c949404 /src/security/vboot/vboot_loader.c
parent7255610d9fe0867de50add6890653f14da676c06 (diff)
downloadcoreboot-344e86bb3baff8f89c1335c190dbee050176e058.tar.xz
security/vboot: Drop CAR_GLOBAL_MIGRATION support
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>
Diffstat (limited to 'src/security/vboot/vboot_loader.c')
-rw-r--r--src/security/vboot/vboot_loader.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/security/vboot/vboot_loader.c b/src/security/vboot/vboot_loader.c
index 3e491a7200..9aaaff2f32 100644
--- a/src/security/vboot/vboot_loader.c
+++ b/src/security/vboot/vboot_loader.c
@@ -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;
}
}