On 11/17/2010 05:26 PM, Ben Gardiner wrote:
> Hi Stefano,
>
Hi Ben,
> I was unable to test this series on top of Sugosh's and my patches
> even after re-basing my patch on top of his by moving the
> da850_emac_mii_mode_sel declaration from
> board/davinci/da8xxevm/common.h to the location from which you have
> removed it above.
>
> It looked like the removal of this file also needs to move the kick
> register declarations that Sugosh added here.
>
> I'm guessing you are working from a tree that is very close but not
> quite equal to mainline plus the patches you referenced in the cover
> letter.
Let's see. I am working on TOT of u-boot mainline, and I have applied
Sugosh's and your patch. Last u-boot commit in mainline is:
commit 8ad25bf8d9233eb7d0b614612108622a59069354
Author: Ben Warren <biggerbadder...@gmail.com>
Date: Tue Aug 31 23:05:04 2010 -0700
Net: clarify board/cpu_eth_init calls
I have then applied in the order the two SPI flash I have already sent
and you tested, Sugosh's patch and your patch. At the very top there is
my patchset. This is my git log, I drop some part of the commit id to
avoid wrapping:
6a1b17dd5cdaeb4c Davinci: add support for the ea20 board
5195253f20d5bedb Davinci 8xx: Move common functions to share code
8e6ed317d74b3b4d da850: Add RMII support for EMAC
9c1455c63dafc292 Move and rename common headers from under board/davinci.
4ccdfedb55b65f30 da850: Enable SPI Flash
0aacad5f81caac89 da8xx: Add cpu_is_da8xx macros
8ad25bf8d9233eb7 Net: clarify board/cpu_eth_init calls
^
|------- this is actual u-boot TOT
I think it is correct - patches are always sent on the actual u-boot
TOT. However, in this case my patches need that other patches (yours and
Sugosh's) are applied. I have tried to apply patches in the same order I
have seen, but we can have a different order.
> I don't know what is the best way to proceed... I like the current
> state of this patch series. I was unable to apply the three patch
> series (Sugosh's, Yours and mine) in any order without conflicts.
Let's see if something is missing ;-)
Best 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: off...@denx.de
=====================================================================
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
