[U-Boot] [PATCH 1/2][NEXT] Davinci 8xx: Move common functions to share code

sughosh ganu urwithsughosh at gmail.com
Tue Nov 23 17:55:57 CET 2010


hi Ben,

On Fri, Nov 19, 2010 at 3:20 AM, Ben Gardiner <bengardiner at nanometrics.ca>wrote:

>
> Still, there were some merge conflicts due to the fact that you were
> basing your ea20 patches off of only 1 of Sugosh's patches. here is
> the 'git log --format="%s -- %Cgreen%an <%aE> %Cred%ai"
> u-boot/master^..HEAD' output after all the merging.
>
> Davinci: add support for the ea20 board -- Stefano Babic
> <sbabic at denx.de> 2010-11-17 11:09:05 +0100
> Davinci 8xx: Move common functions to share code -- Stefano Babic
> <sbabic at denx.de> 2010-11-17 11:09:04 +0100
> [PATCH V4][NEXT] da850: Add RMII support for EMAC -- Sudhakar
> Rajashekhara <sudhakar.raj at ti.com> 2010-11-18 09:59:37 -0500
> Add board support for hawkboard -- Sughosh Ganu
> <urwithsughosh at gmail.com> 2010-11-01 23:30:34 +0530
> Remove board_init_f function from nand_boot.c -- Sughosh Ganu
> <urwithsughosh at gmail.com> 2010-11-01 23:29:27 +0530
> Move and rename common headers from under board/davinci. -- Sughosh
> Ganu <urwithsughosh at gmail.com> 2010-11-01 23:28:38 +0530
> da850: Enable SPI Flash -- Stefano Babic <sbabic at denx.de> 2010-11-11
> 15:38:02 +0100
> da8xx: Add cpu_is_da8xx macros -- Sudhakar Rajashekhara
> <sudhakar.raj at ti.com> 2010-11-11 15:38:01 +0100
> Net: clarify board/cpu_eth_init calls -- Ben Warren
> <biggerbadderben at gmail.com> 2010-08-31 23:05:04 -0700
>
> You didn't have "Add board support for hawkboard" and "Remove
> board_init_f function from nand_boot.c" applied.
>
> I hope you don't mind that I merged them and pushed the result to
> branch "testing-ea20-plus" of
> git://github.com/BenGardiner/u-boot-bg.git . I hope that saves us some
> time.
>
> I will be sending a V4 of the RMII patch -- as can be seen from that
> series -- to the list. I hope you can use the merged patches in the
> branch I pushed to send your updated patches.
>
>
Tested on hawkboard with u-boot and nand_spl images built from Ben's tree.

Tested-by: Sughosh Ganu <urwithsughosh at gmail.com>

I guess i will have to send an updated version from Ben's tree, as he has
fixed some merge issues in "Add board support for hawkboard" patch. The
patches would have to be committed in the same order as mentioned above.

-sughosh


More information about the U-Boot mailing list