target: msm8953: Change to make VB2.0 detection runtime.
Change to remove MOTA macro to make VB2.0 detection runtime,
and loading of appropriate libraries.
Change-Id: I1e0a389743295e427faf50767050a8f75ddd4a7a
diff --git a/target/msm8953/init.c b/target/msm8953/init.c
index a0b118a..159279d 100644
--- a/target/msm8953/init.c
+++ b/target/msm8953/init.c
@@ -260,11 +260,6 @@
void target_init(void)
{
-#if VERIFIED_BOOT
-#if !VBOOT_MOTA
- int ret = 0;
-#endif
-#endif
dprintf(INFO, "target_init()\n");
spmi_init(PMIC_ARB_CHANNEL_NUM, PMIC_ARB_OWNER_ID);
@@ -291,43 +286,40 @@
target_crypto_init_params();
#if VERIFIED_BOOT
-#if !VBOOT_MOTA
- clock_ce_enable(CE1_INSTANCE);
-
- /* Initialize Qseecom */
- ret = qseecom_init();
-
- if (ret < 0)
+ if (VB_V2 == target_get_vb_version())
{
- dprintf(CRITICAL, "Failed to initialize qseecom, error: %d\n", ret);
- ASSERT(0);
- }
+ clock_ce_enable(CE1_INSTANCE);
- /* Start Qseecom */
- ret = qseecom_tz_init();
+ /* Initialize Qseecom */
+ if (qseecom_init() < 0)
+ {
+ dprintf(CRITICAL, "Failed to initialize qseecom\n");
+ ASSERT(0);
+ }
- if (ret < 0)
- {
- dprintf(CRITICAL, "Failed to start qseecom, error: %d\n", ret);
- ASSERT(0);
- }
+ /* Start Qseecom */
+ if (qseecom_tz_init() < 0)
+ {
+ dprintf(CRITICAL, "Failed to start qseecom\n");
+ ASSERT(0);
+ }
- if (rpmb_init() < 0)
- {
- dprintf(CRITICAL, "RPMB init failed\n");
- ASSERT(0);
- }
+ if (rpmb_init() < 0)
+ {
+ dprintf(CRITICAL, "RPMB init failed\n");
+ ASSERT(0);
+ }
- /*
- * Load the sec app for first time
- */
- if (load_sec_app() < 0)
- {
- dprintf(CRITICAL, "Failed to load App for verified\n");
- ASSERT(0);
+ /*
+ * Load the sec app for first time
+ */
+ if (load_sec_app() < 0)
+ {
+ dprintf(CRITICAL, "Failed to load App for verified\n");
+ ASSERT(0);
+ }
}
#endif
-#endif
#if SMD_SUPPORT
rpm_smd_init();
@@ -428,24 +420,25 @@
clock_ce_disable(CE1_INSTANCE);
#if VERIFIED_BOOT
-#if !VBOOT_MOTA
- if (is_sec_app_loaded())
+ if (VB_V2 == target_get_vb_version())
{
- if (send_milestone_call_to_tz() < 0)
+ if (is_sec_app_loaded())
{
- dprintf(CRITICAL, "Failed to unload App for rpmb\n");
+ if (send_milestone_call_to_tz() < 0)
+ {
+ dprintf(CRITICAL, "Failed to unload App for rpmb\n");
+ ASSERT(0);
+ }
+ }
+
+ if (rpmb_uninit() < 0)
+ {
+ dprintf(CRITICAL, "RPMB uninit failed\n");
ASSERT(0);
}
- }
- if (rpmb_uninit() < 0)
- {
- dprintf(CRITICAL, "RPMB uninit failed\n");
- ASSERT(0);
+ clock_ce_disable(CE1_INSTANCE);
}
-
- clock_ce_disable(CE1_INSTANCE);
-#endif
#endif
#if SMD_SUPPORT