All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefano Babic <sbabic@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] imx51 u-boot
Date: Wed, 27 Jan 2010 18:58:31 +0100	[thread overview]
Message-ID: <4B607EC7.8000409@denx.de> (raw)
In-Reply-To: <E1NaBve-00035K-4x@amazonia.comcast.net>

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
=====================================================================

  reply	other threads:[~2010-01-27 17:58 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <E1NYQ1O-0003AU-BE@amazonia.comcast.net>
2010-01-22 21:49 ` [U-Boot] imx51 u-boot Stefano Babic
2010-01-26 19:10   ` Rick Bronson
2010-01-26 21:59     ` Eric Bénard
2010-01-27  9:04     ` Stefano Babic
2010-01-27 14:25       ` Rick Bronson
2010-01-27 16:26         ` Stefano Babic
2010-01-27 17:21           ` Rick Bronson
2010-01-27 17:39             ` Stefano Babic
2010-01-27 17:43               ` Rick Bronson
2010-01-27 17:58                 ` Stefano Babic [this message]
2010-01-27 18:03                   ` Rick Bronson
2010-01-27 18:33                   ` Rick Bronson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4B607EC7.8000409@denx.de \
    --to=sbabic@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.