Hi Stefano,
Sorry for the long delay. I thought rebasing my patch onto Sugosh's series would be a good start to getting all of our patches applied together. What I didn't realize was I that I still did not have the order of patches you listed below.
On Wed, Nov 17, 2010 at 11:47 AM, Stefano Babic sbabic@denx.de wrote:
[...] 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
The problem was that I was applying my RMII patch on top of Sugosh's patches without your SPI flash patches underneath. Another RMII version patch is coming.
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@denx.de 2010-11-17 11:09:05 +0100 Davinci 8xx: Move common functions to share code -- Stefano Babic sbabic@denx.de 2010-11-17 11:09:04 +0100 [PATCH V4][NEXT] da850: Add RMII support for EMAC -- Sudhakar Rajashekhara sudhakar.raj@ti.com 2010-11-18 09:59:37 -0500 Add board support for hawkboard -- Sughosh Ganu urwithsughosh@gmail.com 2010-11-01 23:30:34 +0530 Remove board_init_f function from nand_boot.c -- Sughosh Ganu urwithsughosh@gmail.com 2010-11-01 23:29:27 +0530 Move and rename common headers from under board/davinci. -- Sughosh Ganu urwithsughosh@gmail.com 2010-11-01 23:28:38 +0530 da850: Enable SPI Flash -- Stefano Babic sbabic@denx.de 2010-11-11 15:38:02 +0100 da8xx: Add cpu_is_da8xx macros -- Sudhakar Rajashekhara sudhakar.raj@ti.com 2010-11-11 15:38:01 +0100 Net: clarify board/cpu_eth_init calls -- Ben Warren biggerbadderben@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.
Best Regards, Ben Gardiner
--- Nanometrics Inc. http://www.nanometrics.ca