[PATCH 1/1] arm: fix zImage support when a oftree is concatenated

[Jean-Christophe PLAGNIOL-VILLARD]

When a oftree is concatenated,the zImage is bigger than the size specified in
the zImage header. Detect it copy the full zImage into the memory.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
 arch/arm/lib/bootm.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index defc89b..26833bd 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -125,6 +125,7 @@ struct zimage_header {
 
 static int do_bootz_linux(struct image_data *data)
 {
+	struct stat st;
 	int fd, ret, swap = 0;
 	struct zimage_header __header, *header;
 	void *zimage;
@@ -171,7 +172,10 @@ static int do_bootz_linux(struct image_data *data)
 	if (swap)
 		end = swab32(end);
 
-	data->os_res = request_sdram_region("zimage", load_address, end);
+	if (stat(data->os_file, &st) < 0)
+		st.st_size = end;
+
+	data->os_res = request_sdram_region("zimage", load_address, st.st_size);
 	if (!data->os_res) {
 		ret = -ENOMEM;
 		goto err_out;
@@ -181,15 +185,18 @@ static int do_bootz_linux(struct image_data *data)
 
 	memcpy(zimage, header, sizeof(*header));
 
-	ret = read_full(fd, zimage + sizeof(*header), end - sizeof(*header));
+	ret = read_full(fd, zimage + sizeof(*header), st.st_size - sizeof(*header));
 	if (ret < 0)
 		goto err_out;
-	if (ret < end - sizeof(*header)) {
+	if (ret < st.st_size - sizeof(*header)) {
 		printf("premature end of image\n");
 		ret = -EIO;
 		goto err_out;
 	}
 
+	if (file_detect_type(zimage + end) == filetype_oftree)
+		pr_info("zImage: concatenated oftree detected\n");
+
 	if (swap) {
 		void *ptr;
 		for (ptr = zimage; ptr < zimage + end; ptr += 4)
-- 
1.7.9.1