Merge "platform: msm_shared: Remove loaded partition number increment"
diff --git a/platform/msm8952/acpuclock.c b/platform/msm8952/acpuclock.c
index 57e4d0c..9efe09b 100644
--- a/platform/msm8952/acpuclock.c
+++ b/platform/msm8952/acpuclock.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015, 2018-2019, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -418,22 +418,6 @@
}
}
-/* Function to asynchronously reset CE.
- * Function assumes that all the CE clocks are off.
- */
-static void ce_async_reset(uint8_t instance)
-{
- /* Start the block reset for CE */
- writel(1, GCC_CRYPTO_BCR);
-
- udelay(2);
-
- /* Take CE block out of reset */
- writel(0, GCC_CRYPTO_BCR);
-
- udelay(2);
-}
-
void clock_ce_enable(uint8_t instance)
{
int ret;
@@ -521,7 +505,5 @@
clock_ce_disable(instance);
- ce_async_reset(instance);
-
clock_ce_enable(instance);
}
diff --git a/platform/msm_shared/avb/VerifiedBoot.c b/platform/msm_shared/avb/VerifiedBoot.c
index 5b5baaa..19ebe4d 100644
--- a/platform/msm_shared/avb/VerifiedBoot.c
+++ b/platform/msm_shared/avb/VerifiedBoot.c
@@ -449,11 +449,6 @@
}
RequestedPartition = (const CHAR8 **)RequestedPartitionAll;
- if (Info->num_loaded_images) {
- /* fastboot boot option, skip Index 0, boot image already loaded */
- RequestedPartition = (const CHAR8 **)&RequestedPartitionAll[1];
- NumRequestedPartition--;
- }
VerityFlags = VerityEnforcing ?
AVB_HASHTREE_ERROR_MODE_RESTART :
diff --git a/platform/msm_shared/avb/libavb/avb_slot_verify.c b/platform/msm_shared/avb/libavb/avb_slot_verify.c
index 40bfbe5..60d4a5f 100644
--- a/platform/msm_shared/avb/libavb/avb_slot_verify.c
+++ b/platform/msm_shared/avb/libavb/avb_slot_verify.c
@@ -232,6 +232,8 @@
NULL);
ret = AVB_SLOT_VERIFY_RESULT_ERROR_VERIFICATION;
goto out;
+ } else {
+ avb_debugv(part_name, ": success: Image verification completed.\n", NULL);
}
ret = AVB_SLOT_VERIFY_RESULT_OK;
diff --git a/platform/msm_shared/avb/libavb/avb_util.h b/platform/msm_shared/avb/libavb/avb_util.h
index 07c3258..93046c8 100644
--- a/platform/msm_shared/avb/libavb/avb_util.h
+++ b/platform/msm_shared/avb/libavb/avb_util.h
@@ -37,6 +37,7 @@
#define AVB_STRINGIFY(x) #x
#define AVB_TO_STRING(x) AVB_STRINGIFY(x)
+#define AVB_ENABLE_DEBUG 1
#ifdef AVB_ENABLE_DEBUG
/* Aborts the program if |expr| is false.