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

[Albert ARIBAUD]

Hi Prafulla,

On Tue, 8 Jan 2013 09:21:40 -0800, Prafulla Wadaskar
<prafulla at marvell.com> wrote:

> Dear Albert
> Please pull
> 
> The following changes since commit 7528cf5f016b5b8b8b12b373f6f31a10bf89233d:
> 
>   Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-01-08 14:59:37 +0100)
> 
> are available in the git repository at:
> 
>   u-boot-marvell.git master branch.
> 
> Albert ARIBAUD (3):
>       mv88e61xx: refactor PHY and SWITCH level-code
>       kirkwood: make MPP arrays static const
>       ARM: lacie_kw: add support for WIRELESS_SPACE
> 
> Andreas Bießmann (1):
>       mv-common.h: increase malloc arena to 4MiB
> 
> Holger Brunck (3):
>       arm/km: fix memory settings
>       km/common: drop unneeded std* environment variables
>       km/common: cosmetic change reported from checkpatch
> 
> Luke Lowrey (1):
>       arch-kirkwood: Ethernet port macro returning incorrect address
> 
> Michael Walle (1):
>       lsxl: unset ncip for rescue mode
> 
> Valentin Longchamp (1):
>       arm/km: remove duplicate code
> 
>  arch/arm/cpu/arm926ejs/kirkwood/mpp.c           |    2 +-
>  arch/arm/include/asm/arch-kirkwood/cpu.h        |    2 +-
>  arch/arm/include/asm/arch-kirkwood/mpp.h        |    2 +-
>  board/LaCie/net2big_v2/net2big_v2.c             |    2 +-
>  board/LaCie/netspace_v2/netspace_v2.c           |    2 +-
>  board/LaCie/wireless_space/Makefile             |   46 +++
>  board/LaCie/wireless_space/kwbimage.cfg         |   82 ++++
>  board/LaCie/wireless_space/wireless_space.c     |  176 ++++++++
>  board/Marvell/dreamplug/dreamplug.c             |    2 +-
>  board/Marvell/guruplug/guruplug.c               |    2 +-
>  board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c |    2 +-
>  board/Marvell/openrd/openrd.c                   |    2 +-
>  board/Marvell/rd6281a/rd6281a.c                 |    2 +-
>  board/Marvell/sheevaplug/sheevaplug.c           |    2 +-
>  board/Seagate/dockstar/dockstar.c               |    2 +-
>  board/buffalo/lsxl/lsxl.c                       |    7 +-
>  board/cloudengines/pogo_e02/pogo_e02.c          |    2 +-
>  board/d-link/dns325/dns325.c                    |    2 +-
>  board/iomega/iconnect/iconnect.c                |    2 +-
>  board/karo/tk71/tk71.c                          |    2 +-
>  board/keymile/common/common.c                   |    2 +-
>  board/keymile/km_arm/km_arm.c                   |   16 +-
>  board/keymile/km_arm/kwbimage-memphis.cfg       |    6 +-
>  board/keymile/km_arm/kwbimage.cfg               |    6 +-
>  board/keymile/km_arm/kwbimage_128M16_1.cfg      |   25 +-
>  board/keymile/km_arm/kwbimage_256M8_1.cfg       |   25 +-
>  board/raidsonic/ib62x0/ib62x0.c                 |    2 +-
>  boards.cfg                                      |    1 +
>  drivers/net/phy/mv88e61xx.c                     |  495 ++++++++++++++--------
>  drivers/net/phy/mv88e61xx.h                     |   39 ++-
>  drivers/spi/kirkwood_spi.c                      |   12 +-
>  include/configs/km/keymile-common.h             |    3 -
>  include/configs/lsxl.h                          |    2 +-
>  include/configs/mv-common.h                     |    2 +-
>  include/configs/wireless_space.h                |  194 +++++++++
>  include/netdev.h                                |   21 +-
>  36 files changed, 896 insertions(+), 298 deletions(-)
>  create mode 100644 board/LaCie/wireless_space/Makefile
>  create mode 100644 board/LaCie/wireless_space/kwbimage.cfg
>  create mode 100644 board/LaCie/wireless_space/wireless_space.c
>  create mode 100644 include/configs/wireless_space.h
> 
> Regards...
> Prafulla . . .
> 
> ________________________________________
> From: Albert ARIBAUD [albert.u.boot at aribaud.net]
> Sent: Tuesday, January 08, 2013 8:33 PM
> To: Prafulla Wadaskar
> Cc: 'u-boot at lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik; 'Wolfgang Denk'; Andreas Bießmann
> Subject: Re: Pull request for u-boot-marvell.git
> 
> Hi Prafulla,
> 
> On Mon, 7 Jan 2013 04:26:09 -0800, Prafulla Wadaskar
> <prafulla at marvell.com> wrote:
> >
> >
> > > -----Original Message-----
> > > From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
> > > Sent: 23 December 2012 20:40
> > > To: Prafulla Wadaskar
> > > Cc: 'u-boot at lists.denx.de'; Ashish Karkare; Prabhanjan Sarnaik;
> > > 'Wolfgang Denk'; Andreas Bießmann
> > > Subject: Re: Pull request for u-boot-marvell.git
> > >
> > > Hi Prafulla,
> > >
> > > On Thu, 20 Dec 2012 02:05:36 -0800, Prafulla Wadaskar
> > > <prafulla at marvell.com> wrote:
> > > > Dear Albert
> > > > Please discard my earlier pull request and please pull
> > > > The following changes since commit
> > > b8a7c467960ffb4d5a5e1eef5f7783fb6f594542:
> > > >   Albert ARIBAUD (1):
> > > >         Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
> > > >
> > > > are available in the git repository at:
> > > >
> > > >   u-boot-marvell.git master branch.
> > > >
> > > > Albert ARIBAUD (3):
> > > >       mv88e61xx: refactor PHY and SWITCH level-code
> > > >       kirkwood: make MPP arrays static const
> > > >       ARM: lacie_kw: add support for WIRELESS_SPACE
> > > >
> > > > Holger Brunck (3):
> > > >       arm/km: fix memory settings
> > > >       km/common: drop unneeded std* environment variables
> > > >       km/common: cosmetic change reported from checkpatch
> > > >
> > > > Luke Lowrey (1):
> > > >       arch-kirkwood: Ethernet port macro returning incorrect address
> > > >
> > > > Michael Walle (1):
> > > >       lsxl: unset ncip for rescue mode
> > > >
> > > > Valentin Longchamp (1):
> > > >       arm/km: remove duplicate code
> > > >
> > > > andreas.devel at googlemail.com (1):
> > > >       mv-common.h: increase malloc arena to 4MiB
> > >
> > > Is that last commit really supposed to be with Andreas Bießmann's
> > > e-mail only, without his name?
> >
> > Hi Albert,
> > Sorry for the late reply,
> > Yes, it is with Andreas Bießmann' email only, I wonder how his name is removed from this commit.
> > I will check and let you know.
> 
> Ok - note that meanwhile, I have merged in TI and IMX.
> 
> > Regards...
> > Prafulla . . .
> 
> Amicalement,
> --
> Albert.

Applied to u-boot-arm/master, thanks!

Amicalement,
-- 
Albert.