[U-Boot] imx51 u-boot
Stefano Babic
sbabic at denx.de
Wed Jan 27 18:58:31 CET 2010
Rick Bronson wrote:
>> You cannot expect that patch works if you runs the previous ones with
>> dry-run and the current patch modifies files already patched in the
>> previous ones.
>
> Very true ;-)
>
> Number 10 still fails :(
>
> /u-boot> cat ~/tlc/dqp1130/u-boot.imx51.10.patch | patch -p1
> patching file cpu/arm_cortexa8/mx51/Makefile
> patching file cpu/arm_cortexa8/mx51/speed.c
> patching file drivers/mmc/fsl_esdhc.c
> patching file include/asm-arm/global_data.h
> patching file include/fsl_esdhc.h
> Hunk #1 FAILED at 32.
> 1 out of 2 hunks FAILED -- saving rejects to file include/fsl_esdhc.h.rej
You must take a look at the reason. However, I see a recent commit for
this file that changed SYSCTL_CLOCK_MASK, as I did, too. Because I
changed (in the same way) this mask, the patch cannot directly applied.
However, you can easy fix it adding the defines I needed.
There are still comments about using IO accessors function, so I will
rebase it before sending again).
Regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
More information about the U-Boot
mailing list