In message <[EMAIL PROTECTED]> you wrote:
> Update MX31ADS default environment to better match the flash layout and
> the memory map, support SPI and RTC.
>
> Signed-off-by: Guennadi Liakhovetski <[EMAIL PROTECTED]>
>
> ---
>
> diff --git a/board/mx31ads/mx31ads.c b/board/mx31ads/mx31ads.c
This doesn't apply at all:
Applying MX31ADS environment variable update, spi and rtc support
error: board/mx31ads/mx31ads.c: does not exist in index
error: include/configs/mx31ads.h: does not exist in index
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (delete/modify): board/mx31ads/mx31ads.c deleted in HEAD and
modified in MX31ADS environment variable update, spi and rtc support.
Version MX31ADS environment variable update, spi and rtc support of
board/mx31ads/mx31ads.c left in tree.
CONFLICT (delete/modify): include/configs/mx31ads.h deleted in HEAD
and modified in MX31ADS environment variable update, spi and rtc
support. Version MX31ADS environment variable update, spi and rtc
support of include/configs/mx31ads.h left in tree.
Failed to merge in the changes.
Patch failed at 0001.
Please fix and resubmit.
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: [EMAIL PROTECTED]
Alan Turing thought about criteria to settle the question of whether
machines can think, a question of which we now know that it is about
as relevant as the question of whether submarines can swim.
-- Edsger Dijkstra
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
