[U-Boot] [PATCH 2/2] tools: mkimage: split code into core, default and FIT image specific

[Wolfgang Denk]

Dear Prafulla Wadaskar,

In message <1250380700-15636-2-git-send-email-prafulla at marvell.com> you wrote:
> This is first step towards cleaning mkimage code for kwbimage
> support in clean way. Current mkimage code is very specific to
> uimg generation whereas the same framework can be used to
> generate other image types like Kirkwood boot image (kwbimage-TBD).
> For this, the architecture of mkimage code need to modified.
> 
> Here is the brief plan for the same:-
> a) Split mkimage code into core and image specific support
> b) Implement callback function for image specific functions
> c) Move image type specific code to respective c files
>        Currently there are two types of file generation/list
>        supported (i.e uimg, FIT), the code is abstracted from
>        mkimage.c/h and put in default_image.c and fit_image.c
>        all code in these file is static except init function call
> d) mkimage_register API is added to add new image type support
> All above is addressed in this patch
> e) Add kwbimage type support to this new framework (TBD)
> 
> Signed-off-by: Prafulla Wadaskar <prafulla at marvell.com>
> ---
>  tools/Makefile        |    9 +-
>  tools/default_image.c |  149 ++++++++++++++
>  tools/fit_image.c     |  212 +++++++++++++++++++
>  tools/mkimage.c       |  539 +++++++++++++++++++++++--------------------------
>  tools/mkimage.h       |  101 +++++++++-
>  5 files changed, 720 insertions(+), 290 deletions(-)
>  create mode 100644 tools/default_image.c
>  create mode 100644 tools/fit_image.c

I have only but a few minor comments (which I probably would clean up
myself), but the problem is: the patch doesn't apply to the current
"mkimage" branch:

Applying: tools: mkimage: split code into core, default and FIT image
specific
error: patch failed: tools/mkimage.c:152
error: tools/mkimage.c: patch does not apply
fatal: sha1 information is lacking or useless (tools/Makefile).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0002.


Could you please reebase and resubmit? Thanks in advance (I like how
you implemented this now!)

Best regards,

Wolfgang Denk

-- 
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
Der Horizont vieler Menschen ist ein Kreis mit Radius Null --
und das nennen sie ihren Standpunkt.