[U-Boot-Users] [PATCH 1/1] Add support for the hammerhead (AVR32) board

[Ben Warren]

Haavard Skinnemoen wrote:
> Ben Warren <bwarren at qstreams.com> wrote:
>   
>> Hi Julien,
>>
>> Julien May wrote:
>>     
>>> On Mon, 23 Jun 2008, Haavard Skinnemoen wrote:
>>>
>>>   
>>>       
>>>> Julien May <mailinglist at miromico.ch> wrote:
>>>>     
>>>>         
>>>>> Signed-off-by: Julien May <mailinglist at miromico.ch>
>>>>>       
>>>>>           
>>>> Could you add a few lines describing the Hammerhead board, perhaps with
>>>> a link to your site?
>>>>     
>>>>         
>>> You'll find a short desc. of the hammerhead board on top of the
>>> inc. patch below.
>>>
>>>   
>>>       
>> Please don't do incremental patches.  Just re-submit.
>>     
>
> Sorry, my fault. See below:
>
>   
Oh, I missed you suggesting that idea...
>>>> This looks pretty good to me. I have a few comments below, and I've
>>>> Cc'ed u-boot-users so that more people can comment on this. Please keep
>>>> them in the loop whenever you post a new version of this patch.
>>>>
>>>> If you want, I can apply this to my tree as is, and you can send me
>>>> incremental patches fixing up the remaining issues. I'll fold
>>>> everything into a single patch before sending it upstream.
>>>>
>>>>     
>>>>         
>>> Would be great if you could apply the patch to your tree. Please find
>>> below the incremental patch that should fix all of the remaining issues.
>>>       
>
> ...though I'm not sure what the problem with incremental patches is,
> assuming someone is willing to merge them before they finally go
> upstream. I am willing to do that.
>
>   
I personally think they're hard to follow, add unnecessary dependencies 
and pollute the changelog.  But that's just my opinion.
>>> diff --git a/net/eth.c b/net/eth.c
>>> index 054a9fd..2d6f15f 100644
>>> --- a/net/eth.c
>>> +++ b/net/eth.c
>>>   
>>>       
>> You won't need to touch this file.  Please see how it's done in the 
>> 'next' branch of the net repo on git.denx.de.
>>     
>
> Yeah, but it you don't touch this file, it will only work in your
> 'next' branch. If you don't rebase your next branch, I can pull it into
> my tree and get everything sorted out before the merge window. Hey,
> I'll even fix up a few existing boards :-)
>
> The other possibility is to apply the patch with this hunk present and
> throw it out before I finally merge it after your changes are in. That
> was my initial suggestion.
>
> What do you think?
>   
Just another fun aspect of having non-orthogonal branches and patches.  
The best solution would be for Wolfgang to pull my patch into mainline 
(for r1.3.4).  Technically, a few rounds of the submission were posted 
before the merge window closed, so maybe he'll be in a good mood after 
vacation :)  Otherwise, I don't care - your idea works.  You can move a 
few or all of the macb-using boards over and that would be cool.

cheers,
Ben