diff --git a/project/msm8996.mk b/project/msm8996.mk
index 3f51b81..baefdf8 100644
--- a/project/msm8996.mk
+++ b/project/msm8996.mk
@@ -44,7 +44,6 @@
 
 DEFINES += USB_RESET_FROM_CLK=1
 DEFINES += USE_BOOTDEV_CMDLINE=1
-DEFINES += USE_RPMB_FOR_DEVINFO=1
 DEFINES += ENABLE_WBC=1
 #Enable below flag to compile cmnlib64
 #DEFINES += ENABLE_CMNLIB64_LOADING=1
@@ -57,13 +56,19 @@
 #Disable thumb mode
 ENABLE_THUMB := false
 
+ifeq ($(VERIFIED_BOOT),1)
 #enable fbcon display menu
 ENABLE_FBCON_DISPLAY_MSG := 1
+endif
 
 ifeq ($(ENABLE_FBCON_DISPLAY_MSG),1)
 DEFINES += FBCON_DISPLAY_MSG=1
 endif
 
+ifeq ($(ENABLE_RPMB_SUPPORT),1)
+DEFINES += USE_RPMB_FOR_DEVINFO=1
+endif
+
 ifeq ($(ENABLE_HAP_VIB_SUPPORT),true)
 DEFINES += PON_VIB_SUPPORT=1
 endif