platform: msm_shared: Update the dtb offset before checking dtbo support
Uncompressed kernel, if the kernel image not patched, it could not
locate the dt offset. So it's need to update the dtb offset before
calling dev_tree_appended_with_dtbo.
Change-Id: I65f64a2b792bba37f9fb44ba8913a248dc99ab0f
diff --git a/platform/msm_shared/dev_tree.c b/platform/msm_shared/dev_tree.c
index 770acec..d6b3970 100644
--- a/platform/msm_shared/dev_tree.c
+++ b/platform/msm_shared/dev_tree.c
@@ -1114,8 +1114,13 @@
struct dt_entry_node *dt_node_tmp2 = NULL;
dtbo_error ret = DTBO_NOT_SUPPORTED;
+ if (dtb_offset)
+ app_dtb_offset = dtb_offset;
+ else
+ memcpy((void*) &app_dtb_offset, (void*) (kernel + DTB_OFFSET), sizeof(uint32_t));
+
/* Check for dtbo support */
- ret = dev_tree_appended_with_dtbo(kernel, kernel_size, dtb_offset, tags);
+ ret = dev_tree_appended_with_dtbo(kernel, kernel_size, app_dtb_offset, tags);
if (ret == DTBO_SUCCESS)
return tags;
else if (ret == DTBO_ERROR)
@@ -1131,11 +1136,6 @@
}
list_initialize(&dt_entry_queue->node);
- if (dtb_offset)
- app_dtb_offset = dtb_offset;
- else
- memcpy((void*) &app_dtb_offset, (void*) (kernel + DTB_OFFSET), sizeof(uint32_t));
-
if (((uintptr_t)kernel + (uintptr_t)app_dtb_offset) < (uintptr_t)kernel) {
return NULL;
}