andy-tracking and gdrm-2.6.32

[Martin Jansa]

On Tue, May 18, 2010 at 12:24:27AM +0200, mobi phil wrote:
> >> maybe then merging gdrm stuff from gdrm branch from git.openmoko.org
> >> and rest from gdrm-for-merging?
> >>
> >> or what would be the best to merge to have both stable 2.6.32 and
> >> drm/kms?
> >
> > It's nothing to do with merging, I just made a new branch, cleaned up
> > and more suitable for merging back to the main OM branch, and in the
> > process I introduced a bug which I haven't fixed yet.
> 
> it has to do a bit with merging... Well... you practically answered my
> question with the second part of the answer...
> 
> > Not quite sure what you meant by merging bits of the "old" and "new"
> > gdrm branches, but that certainly won't magically make the problem go
> > away.  The best merge to do if you want everything vaguely stable would
> > be to merge gdrm-2.6.32 into om-2.6.32.  The merge may or may not be
> > easy.. (that's why gdrm-for-merging exists in the first place).
> 
> Maybe wrongly, but I assumed that you introduced that bug to the
> kms/drm part, so I thought to try to merge all non kms/drm from
> gdrm-for-merging with gdrm-2.6.32, that seemed to have stable kms/drm.

Hi,

gdrm-for-merging and gdrm-2.6.32 have both "only" kms/drm extra bits
missing ing om-2.6.32 and both provide same functionality only the first
is cleaned so there are no "non kms/drm bits from gdrm-for-merging to merge 
to gdrm-2.6.32"

om-2.6.32+2.6.32.13+gdrm-2.6.32 is uImage-2.6.32.13-oe1
om-2.6.32+2.6.32.13+gdrm-for-merging is uImage-2.6.32.13-oe2

http://build.shr-project.org/tests/mrmoku/2.6.32/images/om-gta02/

both works ok here, in 2nd is also fixed defconfig and pwm leds
available again.
see:
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=98bed2876d7dd88cc25f1c70929f1d632b8f95ee
http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=14e1ed70361f7f5a5e54d93a606a7c8d53460b95

> But I better wait for the maestro to do that, no rush...

Yes, Thomas is maestro and we're really greatfull for his great glamo
work. Lets hope he will find enough free time soon to squash that bug
and merge his work up.

Regards,
-- 
uin:136542059                jid:Martin.Jansa at gmail.com
Jansa Martin                 sip:jamasip at voip.wengo.fr 
JaMa