target: msm8996: Enable AVB2.0 for msm8996 target

Added conditional compilation flags to compile AVB2.0
changes for msm8996.

Change-Id: I137f00ef42d7c581c4d56ab4bf013c1a58e40c50
diff --git a/project/msm8996.mk b/project/msm8996.mk
index b6f7603..db848e6 100644
--- a/project/msm8996.mk
+++ b/project/msm8996.mk
@@ -56,6 +56,12 @@
 ENABLE_RPMB_SUPPORT := 1
 endif
 
+ifeq ($(VERIFIED_BOOT_2),1)
+#enable fbcon display menu
+ENABLE_FBCON_DISPLAY_MSG := 1
+ENABLE_RPMB_SUPPORT := 1
+endif
+
 ifeq ($(ENABLE_FBCON_DISPLAY_MSG),1)
 DEFINES += FBCON_DISPLAY_MSG=1
 endif
diff --git a/target/msm8996/init.c b/target/msm8996/init.c
index 74c7cd9..98e2c2f 100644
--- a/target/msm8996/init.c
+++ b/target/msm8996/init.c
@@ -185,7 +185,6 @@
 		mmc_put_card_to_sleep(dev);
 	}
 
-#if VERIFIED_BOOT
 	if (target_get_vb_version() >= VB_M &&
 		is_sec_app_loaded())
 	{
@@ -195,7 +194,6 @@
 			ASSERT(0);
 		}
 	}
-#endif
 
 #if ENABLE_WBC
 	if (board_hardware_id() == HW_PLATFORM_MTP)
@@ -410,7 +408,6 @@
 	};
 #endif
 
-#if VERIFIED_BOOT
 	if (VB_M <= target_get_vb_version())
 	{
 		/* Initialize Qseecom */
@@ -442,7 +439,6 @@
 			ASSERT(0);
 		}
 	}
-#endif
 }
 
 unsigned board_machtype(void)