Skip to contentSkip to conversation

mkimage: dont force entry point with xip

PATCH New Mike Frysinger 2 participants 2 messages Jan 25, 2010 – Mar 11, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 tools/mkimage.c |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)
tools/mkimage.c +0 -14
index cf4b754..f71f8e7 100644
@@ -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){
Signature · 1 line
1.6.6.1
#1 lore raw

PATCH 1/1 mkimage: dont force entry point with xip

Dear Mike Frysinger,

Quoted 11 lines · In message <[email protected]> you wrote:

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.

---
 tools/mkimage.c |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
:       I've tried (in vi) "g/[a-z]\n[a-z]/s//_/"...but that doesn't
: cut it.  Any ideas?  (I take it that it may be a two-pass sort of solution).
In the first pass, install perl. :-) Larry Wall <[email protected]>