On Sun, Jul 12, 2009 at 09:57:13PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 15:51 Wed 24 Jun , Scott Wood wrote: > > On Wed, Jun 24, 2009 at 05:23:05PM +0200, Matthias Kaehlcke wrote: > > > Add NAND support for the KwikByte KB9202 > > > > > > Signed-off-by: Matthias Kaehlcke <matth...@kaehlcke.net> > > > > > > --- > > > > > > El Tue, Jun 23, 2009 at 04:19:40PM -0500 Scott Wood ha dit: > > > > > > > I get conflicts in kb9202.h. Is this against an arch tree, or does it > > > > need to be respun? > > > > > > The previous patches were against v2009-03, as i had problems > > > building the current git head for the kb9202 when i started working on > > > the patch. Did you apply the first patch of this series when you got > > > the conflict? This patch is based on the current HEAD. > > > > No - if it depends on other patches that go through an arch tree, then this > > patch should go through that tree as well. > > > > Acked-by: Scott Wood <scottw...@freescale.com> > Scott I've not follow this patch but for the arm part it's looks fine so I'll > let you handle
It still does not apply to the current tree, so I cannot accept it as is. The NAND tree is not an appropriate route for unrelated changes to a board config file (such as CONFIG_BOOTARGS/CONFIG_BOOTCOMMAND) to go -- and even if it were, I don't have an easily applyable version of patch 1/2 (the mailing list archives mangle things). Matthias, can you resend a patch that just adds the NAND driver (for me), and a separate patch that just touches the board config (for the arch tree)? -Scott _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
