Merge 73f10b08c52f1178f3a63942159dd3af314e8f0e on remote branch
Change-Id: I2eccc4e80b9789919de888aded95d21657eb2990
diff --git a/dev/pmic/fgsram/pm_fg_sram.c b/dev/pmic/fgsram/pm_fg_sram.c
index fd4cf14..4fcd238 100644
--- a/dev/pmic/fgsram/pm_fg_sram.c
+++ b/dev/pmic/fgsram/pm_fg_sram.c
@@ -112,7 +112,7 @@
pm_comm_read_byte(sid, FG_MEMIF_MEM_INTF_RD_DATA2, &value, 0);
*data |= value << 16;
pm_comm_read_byte(sid, FG_MEMIF_MEM_INTF_RD_DATA3, &value, 0);
- *data = value << 24;
+ *data |= value << 24;
/* poll to check there was no error */
err = fg_check_addr_mask(sid, FG_MEMIF_IMA_OPERATION_STS, IACS_RDY, 1);
diff --git a/platform/msm_shared/boot_verifier.c b/platform/msm_shared/boot_verifier.c
index 7ee4cba..336efa5 100644
--- a/platform/msm_shared/boot_verifier.c
+++ b/platform/msm_shared/boot_verifier.c
@@ -34,7 +34,9 @@
#include <image_verify.h>
#include <mmc.h>
#include <oem_keystore.h>
+#if VERIFIED_BOOT_2
#include <avb/OEMPublicKey.h>
+#endif
#include <openssl/asn1t.h>
#include <openssl/x509.h>
#include <partition_parser.h>
@@ -889,6 +891,7 @@
return oem_keystore;
}
+#if OSVERSION_IN_BOOTIMAGE
void set_os_version_with_date(unsigned char* img_addr, uint32_t system_security_level)
{
boot_img_hdr *img_hdr = NULL;
@@ -908,7 +911,6 @@
}
}
-#if OSVERSION_IN_BOOTIMAGE
void set_os_version(unsigned char* img_addr)
{
boot_img_hdr *img_hdr = NULL;
@@ -927,6 +929,11 @@
{
return;
}
+
+void set_os_version_with_date(unsigned char* img_addr, uint32_t system_security_level)
+{
+ return;
+}
#endif
int set_verified_boot_hash (const char *vbh, size_t vbh_size)