Merge "target: msm8952: increase heap size to 3MB for mdtp feature"
diff --git a/platform/msm_shared/smem_ptable.c b/platform/msm_shared/smem_ptable.c
index b573cc8..647b0dc 100644
--- a/platform/msm_shared/smem_ptable.c
+++ b/platform/msm_shared/smem_ptable.c
@@ -137,13 +137,14 @@
for (i = 0; i < smem_ptable.len; i++) {
char *token;
char *pname = NULL;
+ char *sp;
struct smem_ptn *p = &smem_ptable.parts[i];
if (p->name[0] == '\0')
continue;
- token = strtok(p->name, ":");
+ token = strtok_r(p->name, ":", &sp);
while (token) {
pname = token;
- token = strtok(NULL, ":");
+ token = strtok_r(NULL, ":", &sp);
}
if (pname) {
ptable_add(flash_ptable, pname, p->start,
diff --git a/project/msm8996.mk b/project/msm8996.mk
index 2a8ef25..f862e50 100644
--- a/project/msm8996.mk
+++ b/project/msm8996.mk
@@ -69,6 +69,12 @@
DEFINES += ENABLE_PARTIAL_GOODS_SUPPORT=1
endif
+ifeq ($(ENABLE_MDTP_SUPPORT),1)
+DEFINES += MDTP_SUPPORT=1
+DEFINES += MDTP_EFUSE_ADDRESS=0x00070178 # QFPROM_CORR_ANTI_ROLLBACK_3_LSB_ADDR
+DEFINES += MDTP_EFUSE_START=0
+endif
+
CFLAGS += -Werror
#SCM call before entering DLOAD mode
diff --git a/target/msm8996/init.c b/target/msm8996/init.c
index 2659ee2..a8d0126 100644
--- a/target/msm8996/init.c
+++ b/target/msm8996/init.c
@@ -92,7 +92,7 @@
}
/* Return 1 if vol_up pressed */
-static int target_volume_up()
+int target_volume_up()
{
uint8_t status = 0;
struct pm8x41_gpio gpio;