[U-Boot-Users] [PATCH 02/13] [new uImage] Define a API for image handling operations

Wolfgang Denk
2008-01-12T00:48:55Z

Dear Marian,

in message <20080111142800.8025.66590.stgit@hekate.izotz.org> you wrote:
> - Add inline helper macros for basic header processing
> - Move common non inline code common/image.c
> - Replace direct header access with the API routines
> - Rename IH_CPU_* to IH_ARCH_*
>
> Signed-off-by: Marian Balakowicz <m8@semihalf.com>

I tried to apply your patches to the u-boot-testing repository;
unfortunately, this does now work:

-> git-am -3 -i -u --whitespace=strip ~/Mail/U-Boot/13330
Commit Body is:
--------------------------
Define a API for image handling operations

- Add inline helper macros for basic header processing
- Move common non inline code common/image.c
- Replace direct header access with the API routines
- Rename IH_CPU_* to IH_ARCH_*

Signed-off-by: Marian Balakowicz <m8@semihalf.com>
--------------------------
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y

Applying Define a API for image handling operations

error: No changes
Using index info to reconstruct a base tree...
error: No changes
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001.
When you have resolved this problem run "git-am -i -3 --resolved".
If you would prefer to skip this patch, instead run "git-am -i -3 --skip".

Can you please check and - if necessary - rebase the patch set?

Thanks.

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
People are always a lot more complicated than you think. It's very
important to remember that. - Terry Pratchett, _Truckers_