From mboxrd@z Thu Jan  1 00:00:00 1970
From: Hans de Goede <hdegoede@redhat.com>
Date: Thu, 31 Jul 2014 16:25:27 +0200
Subject: [U-Boot] Please pull u-boot-sunxi.git/master
In-Reply-To: <20140731172357.5D33.AA925319@jp.panasonic.com>
References: <20140731133047.5D2A.AA925319@jp.panasonic.com>
	<1406793249.28644.57.camel@dagon.hellion.org.uk>
	<20140731172357.5D33.AA925319@jp.panasonic.com>
Message-ID: <53DA51D7.8020908@redhat.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi,

On 07/31/2014 10:23 AM, Masahiro Yamada wrote:
> Hi Ian, Hans,
> 
> 
> On Thu, 31 Jul 2014 08:54:09 +0100
> Ian Campbell <ijc@hellion.org.uk> wrote:
> 
>> On Thu, 2014-07-31 at 13:30 +0900, Masahiro Yamada wrote:
>>> Hi Tom, Albert, Hans,
>>>
>>>
>>> I am afraid we are going to be in trouble
>>> with this pre-Kconfig based PR
>>> because it includes various new boards.
>>
>> Yeah, I was wondering how this would work!
>>
>>> (We can fix the merge conflict,
>>> but it is not trivial.)
>>>
>>>
>>> How this is going to work?
>>>
>>> Perhaps should we discard unmerged PRs and
>>> get all the subsystem repos
>>> synchronized with u-boot/master ?
>>>
>>>
>>> Or shall we break these boards once
>>> and fix them in a follow-up patch ?
>>
>> Can you point us to the conversion script please?
> 
> 
> Sure.
> 
> These are the conversion tools I used in my series:
> 
> http://patchwork.ozlabs.org/patch/374412/
>    for generating *_defconfig and Kconfig
> 
> http://patchwork.ozlabs.org/patch/374406/
>    for generating MAINTAINERS
> 
> 
> I assume you have boards.cfg on your local branch.
> 
> If you run 'tools/genkconfig' and 'tools/gen_maintainers.py',
> *_defconfig, Kconfig, and MAINTAINERS will be generated
> for all the boards listed in the boards.cfg file.
> 
> And then commit --amend the diffs of *_defconfig, Kconfig, MAINTAINERS.

Thanks,

I've rebased the u-boot-sunxi master & next branches (which are in
sync arm) on top of u-boot/master, using the above method.

I've also run some quick tests (and a MAKEALL) and everything still
seems to work fine, one new pull-req coming up.

Regards,

Hans