Merge "platform: msm_shared: Ignore mmc switch status, continue with tunning process."
diff --git a/include/target.h b/include/target.h
index 14c86db..0a0e545 100644
--- a/include/target.h
+++ b/include/target.h
@@ -28,6 +28,9 @@
#define TARGET_MAX_CMDLNBUF 64
+/* Serial Number Length. */
+#define SERIAL_NUMBER_LEN 13
+
/* Enum for target VB version detection */
enum
{
diff --git a/platform/msm8952/platform.c b/platform/msm8952/platform.c
index 184f5e2..e865b30 100644
--- a/platform/msm8952/platform.c
+++ b/platform/msm8952/platform.c
@@ -214,6 +214,7 @@
case MSM8217:
case MSM8617:
case APQ8017:
+ case QM215:
ret = 1;
break;
default:
diff --git a/platform/msm_shared/smem.h b/platform/msm_shared/smem.h
index f32d935..d862e0b 100644
--- a/platform/msm_shared/smem.h
+++ b/platform/msm_shared/smem.h
@@ -473,7 +473,8 @@
SDM429 = 354,
SDM439 = 353,
SDA429 = 364,
- SDA439 = 363
+ SDA439 = 363,
+ QM215 = 386
};
enum platform {
diff --git a/project/msm8952.mk b/project/msm8952.mk
index 668d241..a9cf70e 100644
--- a/project/msm8952.mk
+++ b/project/msm8952.mk
@@ -39,6 +39,9 @@
endif
endif
+#Enable below flag to compile cmnlib64
+DEFINES += ENABLE_CMNLIB64_LOADING=1
+
ENABLE_SMD_SUPPORT := 1
ENABLE_PWM_SUPPORT := true
diff --git a/project/msm8953.mk b/project/msm8953.mk
index 4a502c6..20872cc 100644
--- a/project/msm8953.mk
+++ b/project/msm8953.mk
@@ -40,6 +40,9 @@
endif
endif
+#Enable below flag to compile cmnlib64
+DEFINES += ENABLE_CMNLIB64_LOADING=1
+
ENABLE_SMD_SUPPORT := 1
ENABLE_PWM_SUPPORT := true
diff --git a/target/msm8909/init.c b/target/msm8909/init.c
index a4f69f1..b6a51e5 100644
--- a/target/msm8909/init.c
+++ b/target/msm8909/init.c
@@ -438,10 +438,13 @@
void target_serialno(unsigned char *buf)
{
uint32_t serialno;
- if (target_is_emmc_boot()) {
+ if (target_is_emmc_boot())
serialno = mmc_get_psn();
- snprintf((char *)buf, 13, "%x", serialno);
- }
+ else
+ serialno = board_chip_serial();
+
+ snprintf((char *)buf, SERIAL_NUMBER_LEN, "%x", serialno);
+
}
unsigned board_machtype(void)