Merge "[msm8x60]: Add code to vote for PLL8 before configuring USB clock"
diff --git a/platform/msm_shared/include/mmc.h b/platform/msm_shared/include/mmc.h
index 036548e..c0f662f 100755
--- a/platform/msm_shared/include/mmc.h
+++ b/platform/msm_shared/include/mmc.h
@@ -509,6 +509,7 @@
#define MAX_FILE_ENTRIES 20
#define MMC_MODEM_TYPE 0xc
+#define MMC_MODEM_TYPE2 0x6
#define MMC_BOOT_TYPE 0x48
#define MMC_SYSTEM_TYPE 0x82
#define MMC_USERDATA_TYPE 0x83
diff --git a/platform/msm_shared/mmc.c b/platform/msm_shared/mmc.c
index 2fcc0c7..86d2354 100644
--- a/platform/msm_shared/mmc.c
+++ b/platform/msm_shared/mmc.c
@@ -2097,6 +2097,7 @@
{
memset(mbr_ent->name, 0, 64);
case MMC_MODEM_TYPE:
+ case MMC_MODEM_TYPE2:
/* if there are more than one with type "modem", mmc_ptn_offset will return the first one */
memcpy(mbr_ent->name,"modem",5);
break;
diff --git a/target/msm7627_ffa/tools/mkheader.c b/target/msm7627_ffa/tools/mkheader.c
index 9b03907..2bd3479 100644
--- a/target/msm7627_ffa/tools/mkheader.c
+++ b/target/msm7627_ffa/tools/mkheader.c
@@ -62,7 +62,7 @@
magic[11] = 0x00000001; /* cookie version */
magic[12] = 0x00000002; /* file formats */
magic[13] = 0x00000000;
- magic[14] = 0x00500000; /* 5M for boot.img */
+ magic[14] = 0x00000000; /* not setting size for boot.img */
magic[15] = 0x00000000;
magic[16] = 0x00000000;
magic[17] = 0x00000000;
diff --git a/target/msm7627_surf/tools/mkheader.c b/target/msm7627_surf/tools/mkheader.c
index 9b03907..2bd3479 100644
--- a/target/msm7627_surf/tools/mkheader.c
+++ b/target/msm7627_surf/tools/mkheader.c
@@ -62,7 +62,7 @@
magic[11] = 0x00000001; /* cookie version */
magic[12] = 0x00000002; /* file formats */
magic[13] = 0x00000000;
- magic[14] = 0x00500000; /* 5M for boot.img */
+ magic[14] = 0x00000000; /* not setting size for boot.img */
magic[15] = 0x00000000;
magic[16] = 0x00000000;
magic[17] = 0x00000000;