[U-Boot] Pull request u-boot-marvell.git

Prafulla Wadaskar
2011-05-06T20:43:07Z

> -----Original Message-----
> From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
> Sent: Saturday, May 07, 2011 1:30 AM
> To: Prafulla Wadaskar
> Cc: Wolfgang Denk; 'u-boot at lists.denx.de'; Ashish Karkare; Prabhanjan
> Sarnaik
> Subject: Re: Pull request u-boot-marvell.git
>
> Hi Prafulla,
>
> Please do not use my former address; use my current From: one.
>
> Le 06/05/2011 15:25, Prafulla Wadaskar a ?crit :
> > Hi Albert
> >
> > Please kindly pull
> > The following changes since commit
> 2fa8ca98c37d5b1bb0328b19ddb7e9d162cd9683:
> > Grant Likely (1):
> > Add CONFIG_OF_LIBFDT to more boards.
> >
> > are available in the git repository at:
> >
> > u-boot-marvell.git master branch.
> >
> > Clint Adams (4):
> > Rename openrd_base files to openrd
> > Add definitions for OpenRD-Client and OpenRD-Ultimate
> > Initialize second PHY on OpenRD-Client and OpenRD-Ultimate
> > Enable multiple fs options for Marvell SoC family on OpenRD
> boards
> >
> > Simon Guinot (2):
> > Kirkwood: allow to override CONFIG_SYS_TCLK
> > mv-common.h: fix DRAM banks configuration
>
> Seems like you've got more than these 6 patches on your master branch
> above mine. On my side I see

Yes, you are correct
Even I have mentioned this in my mail.

>
> Clint Adams (4):
> Rename openrd_base files to openrd
> Add definitions for OpenRD-Client and OpenRD-Ultimate
> Initialize second PHY on OpenRD-Client and OpenRD-Ultimate
> Enable multiple fs options for Marvell SoC family on OpenRD
> boards
>
> Jason Liu (2):
> mx53loco: set mmc env to MMC slot1
> MX5: Enable flat-device-tree support on mx53 loco board
>
> Liu Hui-R64343 (1):
> MX53: support for freescale MX53LOCO board
>
> Minkyu Kang (1):
> Don't grab memory for LCD if FB address is defined
>
> Simon Guinot (2):
> Kirkwood: allow to override CONFIG_SYS_TCLK
> mv-common.h: fix DRAM banks configuration
>
> Some of which, IIRC, are not to be applied yet (the MX53LOCO ones, for
> instance) and some which are already (the "don't grab LCD..." one).
>
> Can you double-check your tree?

I have rebased with u-boot-arm.git master and those are available there.
What should I do now to resolve this?
BTW: This is first time I am facing this problem. What is root cause of it?

Regards..
Prafulla. . .

>
> Amicalement,
> --
> Albert.