diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2010-03-23 19:09:13 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-03-23 19:09:13 +0900 |
| commit | 45e565337a90bbca0c1bb712b5e008b7c0b18bd5 (patch) | |
| tree | 8bcaee16cda9d8f90f5b596566ad2122c6d8d86b /tools | |
| parent | 995a4b1d83a08223c82c1e15778b02e85e5bba51 (diff) | |
| parent | d650da2dd4af99967aabc43cccbd8f160eb4cea6 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
cpu/arm920t/ep93xx/timer.c
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mkimage.c | 14 |
1 files changed, 0 insertions, 14 deletions
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){ |