commit 60a48ad612a6f8ebd0371d158c3b056603fd6b7c
author Linux Build Service Account <lnxbuild@localhost> Wed Oct 24 05:45:32 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Oct 24 05:45:32 2018 -0700
tree 92ec4dae7c47b904d3b9848719f4ff7a3c0a6fb4
parent 104ab8a7abcbd996e844bca0113238ae4459f1be
parent 41b3453c2221ad6ad88a185b064f45fbbdaf4dd2

Merge "app: aboot: For AVB2.0, add salt buffer offset to buffer initialized in fastboot mode"

app/aboot/aboot.c

diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index d252c25..e478e49 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -5144,7 +5144,13 @@
 	partition_dump();
 
 	/* initialize and start fastboot */
+#if !VERIFIED_BOOT_2
 	fastboot_init(target_get_scratch_address(), target_get_max_flash_size());
+#else
+	/* Add salt buffer offset at start of image address to copy VB salt */
+	fastboot_init(ADD_SALT_BUFF_OFFSET(target_get_scratch_address()),
+		SUB_SALT_BUFF_OFFSET(target_get_max_flash_size()));
+#endif
 #if FBCON_DISPLAY_MSG
 	display_fastboot_menu();
 #endif