On 11/18/2010 10:50 PM, Ben Gardiner wrote:
Hi Stefano,
Hi Ben,
Sorry for the long delay.
No problem at all !
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.
Right. Sugosh pointed me out to this patch and I have not seen that the patches for the hawkboard change something in common code, too.
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.
Thank you for doing that - we have already a working tree !
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.
I will test today on ea20, but it seems all what I have to do is only to send them to the ML - thank you again for your work !
Best regards, Stefano Babic