commit 5d6d136c9f5999c98a5e972448b7879487008e39
author Linux Build Service Account <lnxbuild@localhost> Mon Sep 26 11:08:43 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Sep 26 11:08:43 2016 -0700
tree 3d6d778dd191ebe9fa224ee753cecb811cf0ce78
parent 091b2728947873495d01e1e87d5471e300a44018
parent d3ed20e88270a7cc0e9982371d35c7080082133f

Merge "app: aboot: Retrieve dt size while booting from flash"

app/aboot/aboot.c

diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index 57c817a..fab78a5 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -1596,11 +1596,16 @@
 	}
 
 #ifndef DEVICE_TREE
-		if (check_aboot_addr_range_overlap(hdr->tags_addr, MAX_TAGS_SIZE))
-		{
-			dprintf(CRITICAL, "Tags addresses overlap with aboot addresses.\n");
-			return -1;
-		}
+	if (check_aboot_addr_range_overlap(hdr->tags_addr, MAX_TAGS_SIZE))
+	{
+		dprintf(CRITICAL, "Tags addresses overlap with aboot addresses.\n");
+		return -1;
+	}
+#else
+
+#ifndef OSVERSION_IN_BOOTIMAGE
+	dt_size = hdr->dt_size;
+#endif
 #endif
 
 	/* Authenticate Kernel */
@@ -1610,9 +1615,6 @@
 		offset = 0;
 
 #if DEVICE_TREE
-#ifndef OSVERSION_IN_BOOTIMAGE
-		dt_size = hdr->dt_size;
-#endif
 		dt_actual = ROUND_TO_PAGE(dt_size, page_mask);
 		if (UINT_MAX < ((uint64_t)kernel_actual + (uint64_t)ramdisk_actual+ (uint64_t)dt_actual + page_size)) {
 			dprintf(CRITICAL, "Integer overflow detected in bootimage header fields\n");