diff --git a/platform/msm8996/include/platform/iomap.h b/platform/msm8996/include/platform/iomap.h
index bda214f..3b7dfd1 100644
--- a/platform/msm8996/include/platform/iomap.h
+++ b/platform/msm8996/include/platform/iomap.h
@@ -684,7 +684,7 @@
 
 #define DDR_START                    platform_get_ddr_start()
 #define ABOOT_FORCE_KERNEL_ADDR      (DDR_START + 0x8000)
-#define ABOOT_FORCE_RAMDISK_ADDR     (DDR_START + 0x2200000)
-#define ABOOT_FORCE_TAGS_ADDR        (DDR_START + 0x2000000)
+#define ABOOT_FORCE_RAMDISK_ADDR     (DDR_START + 0x2700000)
+#define ABOOT_FORCE_TAGS_ADDR        (DDR_START + 0x2500000)
 #define ABOOT_FORCE_KERNEL64_ADDR    (DDR_START + 0x80000)
 #endif
diff --git a/project/msm8909.mk b/project/msm8909.mk
index 790a7b2..3f74902 100755
--- a/project/msm8909.mk
+++ b/project/msm8909.mk
@@ -41,6 +41,7 @@
 ENABLE_SMD_SUPPORT := 1
 ENABLE_PWM_SUPPORT := true
 ENABLE_BOOT_CONFIG_SUPPORT := 1
+ENABLE_VADC_HC_SUPPORT := true
 
 DEFINES += USE_BOOTDEV_CMDLINE=1
 #DEFINES += WITH_DEBUG_DCC=1
diff --git a/project/msm8996.mk b/project/msm8996.mk
index b6f7603..d4b6dac 100644
--- a/project/msm8996.mk
+++ b/project/msm8996.mk
@@ -40,7 +40,7 @@
 DEFINES += USE_BOOTDEV_CMDLINE=1
 DEFINES += ENABLE_WBC=1
 #Enable below flag to compile cmnlib64
-#DEFINES += ENABLE_CMNLIB64_LOADING=1
+DEFINES += ENABLE_CMNLIB64_LOADING=1
 
 ENABLE_HAP_VIB_SUPPORT := true
 
@@ -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..9434738 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)
@@ -212,7 +210,6 @@
 	/* Tear down glink channels */
 	rpm_glink_uninit();
 
-#if VERIFIED_BOOT
 	if (target_get_vb_version() >= VB_M)
 	{
 		if (rpmb_uninit() < 0)
@@ -221,8 +218,6 @@
 			ASSERT(0);
 		}
 	}
-#endif
-
 }
 
 static void set_sdc_power_ctrl()
@@ -410,7 +405,6 @@
 	};
 #endif
 
-#if VERIFIED_BOOT
 	if (VB_M <= target_get_vb_version())
 	{
 		/* Initialize Qseecom */
@@ -442,7 +436,6 @@
 			ASSERT(0);
 		}
 	}
-#endif
 }
 
 unsigned board_machtype(void)