Merge "project: msm8909: select address map for tzapps, based on version."
diff --git a/platform/msm8909/include/platform/iomap.h b/platform/msm8909/include/platform/iomap.h
index 55312e4..5991997 100755
--- a/platform/msm8909/include/platform/iomap.h
+++ b/platform/msm8909/include/platform/iomap.h
@@ -211,7 +211,10 @@
#define RPMB_SND_RCV_BUF_SZ 0x1
/* QSEECOM: Secure app region notification */
-#if QSEECOM_SECAPP_REGION_2MB
+#if QSEECOM_SECAPP_REGION_3MB
+ #define APP_REGION_ADDR 0x87900000
+ #define APP_REGION_SIZE 0x300000
+#elif QSEECOM_SECAPP_REGION_2MB
#define APP_REGION_ADDR 0x87a00000
#define APP_REGION_SIZE 0x200000
#else
diff --git a/platform/msm_shared/scm.c b/platform/msm_shared/scm.c
index bd32e2c..2516e83 100644
--- a/platform/msm_shared/scm.c
+++ b/platform/msm_shared/scm.c
@@ -72,12 +72,10 @@
bool is_scm_armv8_support()
{
-#if !NO_SCM_V8_SUPPORT
if (!scm_initialized)
{
scm_init();
}
-#endif
return scm_arm_support;
}
diff --git a/project/msm8909.mk b/project/msm8909.mk
index 30cf2d9..cbf4b47 100644
--- a/project/msm8909.mk
+++ b/project/msm8909.mk
@@ -97,7 +97,6 @@
#SCM call before entering DLOAD mode
DEFINES += PLATFORM_USE_SCM_DLOAD=1
-DEFINES += NO_SCM_V8_SUPPORT=1
#Enable the external reboot functions
ENABLE_REBOOT_MODULE := 1
@@ -109,7 +108,11 @@
DEFINES += FBCON_DISPLAY_MSG=1
endif
-#Increase TZ apps region to 2 MB due to KM 3.0 support
+#TZ apps region address based on version
+ifeq ($(TARGET_USE_QSEECOM_V4),1)
+ DEFINES += QSEECOM_SECAPP_REGION_3MB=1
+endif
+
ifeq ($(QSEECOM_SECAPP_REGION_2MB),1)
DEFINES += QSEECOM_SECAPP_REGION_2MB=1
endif