Merge "app: aboot: change to pass loaded partition buffers for verification"
diff --git a/platform/msm_shared/dev_tree.c b/platform/msm_shared/dev_tree.c
index 2df16f0..5ad8faf 100644
--- a/platform/msm_shared/dev_tree.c
+++ b/platform/msm_shared/dev_tree.c
@@ -2003,7 +2003,7 @@
int ret = 0;
uint32_t offset;
#if ENABLE_KASLRSEED_SUPPORT
- uintptr_t kaslrseed;
+ uint64_t kaslrseed;
#endif
uint32_t cmdline_len = 0;
@@ -2070,7 +2070,7 @@
}
#if ENABLE_KASLRSEED_SUPPORT
- if (!scm_random(&kaslrseed, sizeof(kaslrseed))) {
+ if (!scm_random((uintptr_t *)&kaslrseed, sizeof(kaslrseed))) {
/* Adding Kaslr Seed to the chosen node */
ret = fdt_appendprop_u64 (fdt, offset, (const char *)"kaslr-seed", (uint64_t)kaslrseed);
if (ret)
diff --git a/target/msm8952/init.c b/target/msm8952/init.c
index 4ce91ec..7c94d06 100644
--- a/target/msm8952/init.c
+++ b/target/msm8952/init.c
@@ -193,7 +193,8 @@
if(platform_is_msm8956())
vol_up_gpio = TLMM_VOL_UP_BTN_GPIO_8956;
else if(platform_is_msm8937() || platform_is_msm8917() ||
- platform_is_sdm429() || platform_is_sdm439())
+ platform_is_sdm429() || platform_is_sdm439() ||
+ platform_is_qm215())
vol_up_gpio = TLMM_VOL_UP_BTN_GPIO_8937;
else
vol_up_gpio = TLMM_VOL_UP_BTN_GPIO;
@@ -676,8 +677,8 @@
bool target_is_pmi_enabled(void)
{
- if(platform_is_msm8917() &&
- (board_hardware_subtype() == HW_PLATFORM_SUBTYPE_SAP_NOPMI))
+ if(platform_is_qm215() || (platform_is_msm8917() &&
+ (board_hardware_subtype() == HW_PLATFORM_SUBTYPE_SAP_NOPMI)))
return 0;
else
return 1;