target: msm8952: Enable AVB2.0 for msm8952 target
Added conditional compilation flags to compile AVB2.0
changes for msm8952.
Change-Id: I8b83d3dec2243fa09ae1e8150f48546be529fea7
diff --git a/project/msm8952.mk b/project/msm8952.mk
index 7bfc1b5..668d241 100644
--- a/project/msm8952.mk
+++ b/project/msm8952.mk
@@ -19,10 +19,11 @@
DEFINES += DISPLAY_SPLASH_SCREEN=1
endif
-ifeq ($(VERIFIED_BOOT),1)
-ENABLE_MDTP_SUPPORT := 1
ENABLE_SECAPP_LOADER := 1
ENABLE_RPMB_SUPPORT := 1
+
+ifeq ($(VERIFIED_BOOT),1)
+ENABLE_MDTP_SUPPORT := 1
#enable fbcon display menu
ifneq (,$(findstring DISPLAY_SPLASH_SCREEN,$(DEFINES)))
ENABLE_FBCON_DISPLAY_MSG := 1
@@ -31,7 +32,12 @@
endif #DISPLAY_SPLASH_SCREEN END
endif #VERIFIED_BOOT
-
+ifeq ($(VERIFIED_BOOT_2),1)
+ifneq (,$(findstring DISPLAY_SPLASH_SCREEN,$(DEFINES)))
+#enable fbcon display menu
+ ENABLE_FBCON_DISPLAY_MSG := 1
+endif
+endif
ENABLE_SMD_SUPPORT := 1
ENABLE_PWM_SUPPORT := true
diff --git a/target/msm8952/init.c b/target/msm8952/init.c
index 404d551..1489467 100644
--- a/target/msm8952/init.c
+++ b/target/msm8952/init.c
@@ -329,7 +329,6 @@
if (target_use_signed_kernel())
target_crypto_init_params();
-#if VERIFIED_BOOT
if (VB_M <= target_get_vb_version())
{
clock_ce_enable(CE1_INSTANCE);
@@ -363,7 +362,6 @@
ASSERT(0);
}
}
-#endif
#if SMD_SUPPORT
rpm_smd_init();
@@ -496,7 +494,6 @@
if (target_is_ssd_enabled())
clock_ce_disable(CE1_INSTANCE);
-#if VERIFIED_BOOT
if (VB_M <= target_get_vb_version())
{
if (is_sec_app_loaded())
@@ -516,7 +513,6 @@
clock_ce_disable(CE1_INSTANCE);
}
-#endif
#if SMD_SUPPORT
rpm_smd_uninit();