Merge "target: msm8996: Set correct panels for DB8096" into lk.lnx.1.0-dev.1.0
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index 30492d7..18733d6 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -2692,7 +2692,7 @@
uint32_t i;
uint8_t lun = 0;
/*End of the sparse image address*/
- uint32_t data_end = (uint32_t)data + sz;
+ uintptr_t data_end = (uintptr_t)data + sz;
index = partition_get_index(arg);
ptn = partition_get_offset(index);
@@ -2721,7 +2721,7 @@
data += sizeof(sparse_header_t);
- if (data_end < (uint32_t)data) {
+ if (data_end < (uintptr_t)data) {
fastboot_fail("buffer overreads occured due to invalid sparse header");
return;
}
@@ -2754,7 +2754,7 @@
chunk_header = (chunk_header_t *) data;
data += sizeof(chunk_header_t);
- if (data_end < (uint32_t)data) {
+ if (data_end < (uintptr_t)data) {
fastboot_fail("buffer overreads occured due to invalid sparse header");
return;
}
@@ -2796,7 +2796,7 @@
return;
}
- if (data_end < (uint32_t)data + chunk_data_sz) {
+ if (data_end < (uintptr_t)data + chunk_data_sz) {
fastboot_fail("buffer overreads occured due to invalid sparse header");
return;
}
@@ -2834,7 +2834,7 @@
return;
}
- if (data_end < (uint32_t)data + sizeof(uint32_t)) {
+ if (data_end < (uintptr_t)data + sizeof(uint32_t)) {
fastboot_fail("buffer overreads occured due to invalid sparse header");
return;
}
@@ -2889,12 +2889,12 @@
return;
}
total_blocks += chunk_header->chunk_sz;
- if ((uint32_t)data > UINT_MAX - chunk_data_sz) {
+ if ((uintptr_t)data > UINT_MAX - chunk_data_sz) {
fastboot_fail("integer overflow occured");
return;
}
data += (uint32_t)chunk_data_sz;
- if (data_end < (uint32_t)data) {
+ if (data_end < (uintptr_t)data) {
fastboot_fail("buffer overreads occured due to invalid sparse header");
return;
}
diff --git a/platform/msm_shared/dev_tree.c b/platform/msm_shared/dev_tree.c
index f120927..5c3d16a 100755
--- a/platform/msm_shared/dev_tree.c
+++ b/platform/msm_shared/dev_tree.c
@@ -416,7 +416,7 @@
*/
void *dev_tree_appended(void *kernel, uint32_t kernel_size, uint32_t dtb_offset, void *tags)
{
- void *kernel_end = kernel + kernel_size;
+ uintptr_t kernel_end = (uintptr_t)kernel + kernel_size;
uint32_t app_dtb_offset = 0;
void *dtb = NULL;
void *bestmatch_tag = NULL;
@@ -426,7 +426,6 @@
struct dt_entry_node *dt_node_tmp1 = NULL;
struct dt_entry_node *dt_node_tmp2 = NULL;
-
/* Initialize the dtb entry node*/
dt_entry_queue = (struct dt_entry_node *)
malloc(sizeof(struct dt_entry_node));
@@ -445,7 +444,8 @@
if (((uintptr_t)kernel + (uintptr_t)app_dtb_offset) < (uintptr_t)kernel) {
return NULL;
}
- dtb = kernel + app_dtb_offset;
+ dtb = (void *)((uintptr_t)kernel + app_dtb_offset);
+
while (((uintptr_t)dtb + sizeof(struct fdt_header)) < (uintptr_t)kernel_end) {
struct fdt_header dtb_hdr;
uint32_t dtb_size;
@@ -1348,4 +1348,3 @@
return ret;
}
-