From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 25 Jan 2010 23:50:11 +0000 (-0500)
Subject: mkimage: dont force entry point with xip
X-Git-Tag: v2010.03-rc1~12
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1b691bb0c2fa18c9b68f15398ef6c8b9e0c0f3e3;p=u-boot

mkimage: dont force entry point with xip

Some people boot images with the entry point in the middle of the blob
(like Linux with the head code in discardable .init.text), and there is no
no real requirement that the entry point be right after the mkimage header
when doing XIP, so let people specify whatever they want.  If they do need
an entry right after the header, then they still can do that with normal
-e behavior.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/tools/mkimage.c b/tools/mkimage.c
index cf4b7546de..f71f8e732b 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -283,20 +283,6 @@ NXTARG:		;
 			params.ep += tparams->header_size;
 	}
 
-	/*
-	 * If XIP, ensure the entry point is equal to the load address plus
-	 * the size of the U-Boot header.
-	 */
-	if (params.xflag) {
-		if (params.ep != params.addr + tparams->header_size) {
-			fprintf (stderr,
-				"%s: For XIP, the entry point must be the load addr + %lu\n",
-				params.cmdname,
-				(unsigned long)tparams->header_size);
-			exit (EXIT_FAILURE);
-		}
-	}
-
 	params.imagefile = *argv;
 
 	if (params.fflag){