Working with Linux-Omap GIT Tree

Working with Linux-Omap GIT Tree

[Ashwin Bihari]

Greetings,

I've been tasked with taking all of the code for our OMAP based board
currently based on the 2.6.22.18 Kernel to the latest version and so I
decided that I would do things in a way that not allowed me to move
our code forward but also allow me to take any new changes made to the
Linux-Omap tree.

To that end, I cloned the GIT tree from
git.kernel.org/linux/kernel/git/tmlind/linux-omap-2.6.git and am
looking at the HEAD of the tree. I was going to start creating
branches for each step of my integration effort which would allow me
to keep things separate and also allow me to pull any changes from the
mainline tree.

When I pulled the tree I noticied that most of the files from the
include/arch-arm/ directory were missing save for a couple of
directories. I then visited the web interface and see the same
situation looking at the latest v2.6.27-rc5 tag from 6 days ago or the
latest commit marked Master. I then began going back to previous tags
and previous commits to see where this changed and had to go all the
way back to v2.6.26-omap1 tag (commit
d6daf8d8cc5ccf90247def5551ee9c3e8555e848) to see the contents of the
include/arch-asm directory, and the commit immediately after (commit
a7448db4826efb097e94f601f4cd9b37053e81bf) is where the files are all
missing.

I'm a bonafide newbie when it comes to GIT and am trying to get my
hands around this while trying not to mess things up in a way that
would require me to re-do a lot of things..

So what's the right way for me to get the latest tree so that I can
begin integrating my code rather than using a tag some 3-4 weeks ago
which contains all the files I'm interested in modifying?

Regards
~ Ashwin

RE: Working with Linux-Omap GIT Tree

[Aguirre Rodriguez, Sergio Alberto]

Hi Ashwin,

The folder you're looking for has been moved to arch/arm/plat-omap/include/

This has to have the same contents you had in that version + the following changes to them.

Hope this helped you.

Regards,
Sergio

-----Original Message-----
From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Ashwin Bihari
Sent: Thursday, September 04, 2008 1:40 PM
To: linux-omap@vger.kernel.org
Subject: Working with Linux-Omap GIT Tree

Greetings,

I've been tasked with taking all of the code for our OMAP based board
currently based on the 2.6.22.18 Kernel to the latest version and so I
decided that I would do things in a way that not allowed me to move
our code forward but also allow me to take any new changes made to the
Linux-Omap tree.

To that end, I cloned the GIT tree from
git.kernel.org/linux/kernel/git/tmlind/linux-omap-2.6.git and am
looking at the HEAD of the tree. I was going to start creating
branches for each step of my integration effort which would allow me
to keep things separate and also allow me to pull any changes from the
mainline tree.

When I pulled the tree I noticied that most of the files from the
include/arch-arm/ directory were missing save for a couple of
directories. I then visited the web interface and see the same
situation looking at the latest v2.6.27-rc5 tag from 6 days ago or the
latest commit marked Master. I then began going back to previous tags
and previous commits to see where this changed and had to go all the
way back to v2.6.26-omap1 tag (commit
d6daf8d8cc5ccf90247def5551ee9c3e8555e848) to see the contents of the
include/arch-asm directory, and the commit immediately after (commit
a7448db4826efb097e94f601f4cd9b37053e81bf) is where the files are all
missing.

I'm a bonafide newbie when it comes to GIT and am trying to get my
hands around this while trying not to mess things up in a way that
would require me to re-do a lot of things..

So what's the right way for me to get the latest tree so that I can
begin integrating my code rather than using a tag some 3-4 weeks ago
which contains all the files I'm interested in modifying?

Regards
~ Ashwin
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Working with Linux-Omap GIT Tree

[Ashwin Bihari]

On Thu, Sep 4, 2008 at 2:44 PM, Aguirre Rodriguez, Sergio Alberto
<saaguirre@ti.com> wrote:
> Hi Ashwin,
>
> The folder you're looking for has been moved to arch/arm/plat-omap/include/
>
> This has to have the same contents you had in that version + the following changes to them.
>
> Hope this helped you.
>
> Regards,
> Sergio

Hi Sergio,

Thanks for the pointer on the move. I should've spent more time poking
around the trees I guess. Sorry for the noise..

~ Ashwin

RE: Working with Linux-Omap GIT Tree

[Aguirre Rodriguez, Sergio Alberto]

And one more thing...

If you have a driver which was previously including a header like this:

#include <arch/arm/clock.h>

You have to change it to:

#include <mach/clock.h>

To point to the new location.

Regards,
Sergio

-----Original Message-----
From: Ashwin Bihari [mailto:abihari@gmail.com] 
Sent: Thursday, September 04, 2008 1:51 PM
To: Aguirre Rodriguez, Sergio Alberto
Cc: linux-omap@vger.kernel.org
Subject: Re: Working with Linux-Omap GIT Tree

On Thu, Sep 4, 2008 at 2:44 PM, Aguirre Rodriguez, Sergio Alberto
<saaguirre@ti.com> wrote:
> Hi Ashwin,
>
> The folder you're looking for has been moved to arch/arm/plat-omap/include/
>
> This has to have the same contents you had in that version + the following changes to them.
>
> Hope this helped you.
>
> Regards,
> Sergio

Hi Sergio,

Thanks for the pointer on the move. I should've spent more time poking
around the trees I guess. Sorry for the noise..

~ Ashwin

Re: Working with Linux-Omap GIT Tree

[Ashwin Bihari]

A quick question about the OMAP GIT trees as I'm playing with them
right now. There are two trees that I can see, one at
http://git.omapzoom.org/repo/omapkernel and another at
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git.
The OMAPZoom tree seems to have a few of the files that are missing
from the git.kernel.org tree that I was looking to modify..

Which tree should I be using to put my board-support files into? Or is
it a combination of the two?

Regards

On Thu, Sep 4, 2008 at 3:04 PM, Aguirre Rodriguez, Sergio Alberto
<saaguirre@ti.com> wrote:
> And one more thing...
>
> If you have a driver which was previously including a header like this:
>
> #include <arch/arm/clock.h>
>
> You have to change it to:
>
> #include <mach/clock.h>
>
> To point to the new location.
>
> Regards,
> Sergio
>
> -----Original Message-----
> From: Ashwin Bihari [mailto:abihari@gmail.com]
> Sent: Thursday, September 04, 2008 1:51 PM
> To: Aguirre Rodriguez, Sergio Alberto
> Cc: linux-omap@vger.kernel.org
> Subject: Re: Working with Linux-Omap GIT Tree
>
> On Thu, Sep 4, 2008 at 2:44 PM, Aguirre Rodriguez, Sergio Alberto
> <saaguirre@ti.com> wrote:
>> Hi Ashwin,
>>
>> The folder you're looking for has been moved to arch/arm/plat-omap/include/
>>
>> This has to have the same contents you had in that version + the following changes to them.
>>
>> Hope this helped you.
>>
>> Regards,
>> Sergio
>
> Hi Sergio,
>
> Thanks for the pointer on the move. I should've spent more time poking
> around the trees I guess. Sorry for the noise..
>
> ~ Ashwin
>
>

Re: Working with Linux-Omap GIT Tree

[Tony Lindgren]

* Ashwin Bihari <abihari@gmail.com> [080909 11:52]:
> A quick question about the OMAP GIT trees as I'm playing with them
> right now. There are two trees that I can see, one at
> http://git.omapzoom.org/repo/omapkernel and another at
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git.
> The OMAPZoom tree seems to have a few of the files that are missing
> from the git.kernel.org tree that I was looking to modify..
> 
> Which tree should I be using to put my board-support files into? Or is
> it a combination of the two?

Create patches against linux-omap. And hopefully against the mainline
tree soonish.

Tony

> 
> Regards
> 
> On Thu, Sep 4, 2008 at 3:04 PM, Aguirre Rodriguez, Sergio Alberto
> <saaguirre@ti.com> wrote:
> > And one more thing...
> >
> > If you have a driver which was previously including a header like this:
> >
> > #include <arch/arm/clock.h>
> >
> > You have to change it to:
> >
> > #include <mach/clock.h>
> >
> > To point to the new location.
> >
> > Regards,
> > Sergio
> >
> > -----Original Message-----
> > From: Ashwin Bihari [mailto:abihari@gmail.com]
> > Sent: Thursday, September 04, 2008 1:51 PM
> > To: Aguirre Rodriguez, Sergio Alberto
> > Cc: linux-omap@vger.kernel.org
> > Subject: Re: Working with Linux-Omap GIT Tree
> >
> > On Thu, Sep 4, 2008 at 2:44 PM, Aguirre Rodriguez, Sergio Alberto
> > <saaguirre@ti.com> wrote:
> >> Hi Ashwin,
> >>
> >> The folder you're looking for has been moved to arch/arm/plat-omap/include/
> >>
> >> This has to have the same contents you had in that version + the following changes to them.
> >>
> >> Hope this helped you.
> >>
> >> Regards,
> >> Sergio
> >
> > Hi Sergio,
> >
> > Thanks for the pointer on the move. I should've spent more time poking
> > around the trees I guess. Sorry for the noise..
> >
> > ~ Ashwin
> >
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: Working with Linux-Omap GIT Tree

[Woodruff, Richard]

Hi,

> From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-
> owner@vger.kernel.org] On Behalf Of Ashwin Bihari

> A quick question about the OMAP GIT trees as I'm playing with them
> right now. There are two trees that I can see, one at
> http://git.omapzoom.org/repo/omapkernel and another at
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git.
> The OMAPZoom tree seems to have a few of the files that are missing
> from the git.kernel.org tree that I was looking to modify..
>
> Which tree should I be using to put my board-support files into? Or is
> it a combination of the two?

Trees are related. Base line is derived by taking kernel.org, then linux-omap, then zoom specifics. The ultimate goal is functionality kernel.org.

The zoom kernel synchronizes with linx-omap frequently. It is different in a few areas. Part of its purpose is to export functionality as soon as possible. Traditionally, early chip development hasn't been available externally. This results in a divergence gap at the time of chip release.  We export the tree as a way to provide access to that work. It will take some time for public flows to pick up functionality. Making this reference available should accelerate new functions back into pure open source.

How you leverage the tree depends on your needs.

A differences list can be found: https://omapzoom.org/gf/project/omapkernel/wiki/?pagename=areas

Regards,
Richard W.