Re: [ECOS] Modifying RedBoot to support multiple flash devices

["Grant Mills" <gmills@ucsd.edu>]

On 3/9/06, Andrew Lunn <andrew@lunn.ch> wrote:
> > Andrew,
> >     So is sounds like I should be able to enter the packages directory
> > and execute this:
> >        cvs -q -z3 up -j flash_v2 io/flash devs/flash redboot
> > Then I'll clean up the conflicts and I should be off and running.  Right?
>
> Humm, looks O.K.
>
> I've never done this myself, i've never needed to mix the branch and
> the trunk. So i cannot say it will actually work.
>
> You might also want to look at the changes that have been made to the
> AMD flash driver in the trunk since the branch was made. Some flash
> devices have been added which might not exist in the V2 driver.
>
>        Andrew
>
>

Andrew,
    Basically the -j switch merges the specified revision (flash_v2,
but it's a branch tag so cvs takes the tips of the branch) into the
current sandbox, which for me is HEAD/tip/trunk.  So I've effectively
brought the flash_v2 changes to the tip.
    There were some conflicts, most were in the ChangeLog files. 
That's expected because cvs detected different changes in the same
space.  There were a few in the code and I'll sort through those
before I build.

All,
    Would anybody be interested in a report on the conflicts?

    Thanks again.

--
Grant Mills
gmills@ucsd.edu

--
Before posting, please read the FAQ: http://ecos.sourceware.org/fom/ecos
and search the list archive: http://ecos.sourceware.org/ml/ecos-discuss