summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/2lib/2kernel.c2
-rw-r--r--firmware/2lib/2secdata_kernel.c5
-rw-r--r--firmware/2lib/include/2api.h9
3 files changed, 15 insertions, 1 deletions
diff --git a/firmware/2lib/2kernel.c b/firmware/2lib/2kernel.c
index fc9158a4..e05726d7 100644
--- a/firmware/2lib/2kernel.c
+++ b/firmware/2lib/2kernel.c
@@ -100,7 +100,7 @@ int vb2api_is_developer_signed(struct vb2_context *ctx)
struct vb2_shared_data *sd = vb2_get_sd(ctx);
if (!sd->kernel_key_offset || !sd->kernel_key_size) {
- VB2_REC_OR_DIE(ctx, "Cannot call this before kernel_phase1!\n");
+ VB2_DEBUG("ERROR: Cannot call this before kernel_phase1!\n");
return 0;
}
diff --git a/firmware/2lib/2secdata_kernel.c b/firmware/2lib/2secdata_kernel.c
index 8b3cf59c..de12ca04 100644
--- a/firmware/2lib/2secdata_kernel.c
+++ b/firmware/2lib/2secdata_kernel.c
@@ -306,3 +306,8 @@ void vb2_secdata_kernel_set_ec_hash(struct vb2_context *ctx,
return;
}
+
+uint32_t vb2api_get_kernel_rollback_version(struct vb2_context *ctx)
+{
+ return vb2_secdata_kernel_get(ctx, VB2_SECDATA_KERNEL_VERSIONS);
+}
diff --git a/firmware/2lib/include/2api.h b/firmware/2lib/include/2api.h
index 5c21989f..d75b9e4b 100644
--- a/firmware/2lib/include/2api.h
+++ b/firmware/2lib/include/2api.h
@@ -817,6 +817,15 @@ uint32_t vb2api_get_firmware_size(struct vb2_context *ctx);
int vb2api_is_developer_signed(struct vb2_context *ctx);
/**
+ * Return the current kernel rollback version from secdata.
+ *
+ * @param ctx Vboot context
+ *
+ * @return The rollback version number.
+ */
+uint32_t vb2api_get_kernel_rollback_version(struct vb2_context *ctx);
+
+/**
* If no display is available, set DISPLAY_REQUEST in nvdata.
*
* @param ctx Vboot2 context