Re: FlashV2 conflict

[Gary Thomas <gary at mlbassoc dot com>]

Jonathan Larmour wrote:
> Andrew Lunn wrote:
> > On Fri, Apr 06, 2007 at 09:17:46AM -0600, Gary Thomas wrote:
> > > There are some things in RedBoot (fs/fileio.c) which aren't
> > > quite right when built using the trunk.  In particular, there
> > > is use of CYGPKG_IO_FLASH_BLOCK_DEVICE_LEGACY which seems to
> > > be only on the FLASHv2 branch.
> > >
> > > What's the best way to fix this?  The attached patches make
> > > file I/O to JFFS2 work on the trunk again for me.
> >
> > Hi Gary
> >
> > It looks like Jifl's merge in of eCosCentric's code broke it.  My
> > guess is that eCosCentrics private tree has flashv2 as default, so
> > they would not of noticed the breakage. 
>
> Sorry about that.
>
> > I think it would be best if eCosCentric fixed this, so there is one
> > fix for both the public and their private tree. If say after a week
> > there is no fix from eCosCentric we take your patch.
>
> We merge in stuff from anoncvs in due course anyway.
>
> 99% of Gary's patch is whitespace change so it's a bit hard to check 
> through it (generally I think it's better to commit those separately to 
> functional changes so version diffs don't get too confusing). So I'll 
> commit a tweaked version of the fixes of substance in Gary's patch, and 
> Gary can commit the whitespace changes separately.
>
> I think rather than remove the use of 
> CYGPKG_IO_FLASH_BLOCK_DEVICE_LEGACY I'd try and make it work with both - 
> somewhat crudely, but it's only temporary until flashv2 is merged.
>
> Attached patch committed.

Thanks - the whitespace changes were a side effect and not important
to the meat of the change anyway.  My biggest impetus in those changes
was that this file had inconsistent indentation/style which simply
bugs me to death :-)

--
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------