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 <i...@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 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot