Merge branch 'tmp-branch' into HEAD
* tmp-branch:
FP2-272: Enable fastboot in all mode(user,userdebug,eng)
FP2-262: [OTA]The device reboot looped after OTA update
FP2-179: Update bootloader splash image
FP2-148： rollback FPII-102 modification to the default penguin logo
FP2-102:phone power on logo - replace penguin with fairphone logo
FP2-32： enable first logo in lk
FP2-19: configure gpio 2 of pm8941 for volume down
FP2-14: add support of lcd otm1902b panel in lk
FP2-15: create Product ID for FP2 project
diff --git a/platform/msm_shared/partition_parser.c b/platform/msm_shared/partition_parser.c
index 6facb93..a702b45 100644
--- a/platform/msm_shared/partition_parser.c
+++ b/platform/msm_shared/partition_parser.c
@@ -930,7 +930,7 @@
{
unsigned int type_offset = TABLE_ENTRY_0 + OFFSET_TYPE;
- if (size < type_offset) {
+ if (size < (type_offset + sizeof (*partition_type))) {
goto end;
}
diff --git a/target/msm8610/init.c b/target/msm8610/init.c
index f64acc2..61135f9 100644
--- a/target/msm8610/init.c
+++ b/target/msm8610/init.c
@@ -303,6 +303,11 @@
return board_baseband();
}
+int emmc_recovery_init(void)
+{
+ return _emmc_recovery_init();
+}
+
void target_serialno(unsigned char *buf)
{
uint32_t serialno;