Patchwork [U-Boot] Please pull u-boot-mpc85xx.git (updated)

login
register
mail settings
Submitter Kumar Gala
Date Nov. 12, 2010, 3:49 p.m.
Message ID <Pine.LNX.4.64.1011120948290.17327@localhost.localdomain>
Download mbox
Permalink /patch/70982/
State Accepted
Headers show

Pull-request

git://git.denx.de/u-boot-mpc85xx master

Comments

Kumar Gala - Nov. 12, 2010, 3:49 p.m.
The following changes since commit 0c0892be0d93a5a892b93739c5eb3bf692fed4ff:

  Merge branch 'master' of git://git.denx.de/u-boot-marvell (2010-10-29 22:03:00 +0200)

are available in the git repository at:

  git://git.denx.de/u-boot-mpc85xx master

Becky Bruce (1):
      TQM85xx: Fix bug introduced by 83xx/85xx/86xx: LBC register cleanup

Haiying Wang (3):
      powerpc/85xx: Fix lds for nand build
      powerpc/85xx: rename CONFIG_SYS_TEXT_BASE to CONFIG_SYS_MONITOR_BASE
      powerpc/85xx: add CONFIG_SYS_TEXT_BASE_SPL for 85xx nand spl build

Kumar Gala (5):
      powerpc/8xxx: Fix merge issue with P2020DS DDR2 build config
      powerpc/8xxx: Enable e1000 driver on some FSL boards
      powerpc/corenet_ds: Enable DHCP suport
      powerpc/corenet_ds: Move CONFIG_SYS_TEXT_BASE into corenet_ds.h
      powerpc/p4080ds: Move ICS refclk define into P4080DS.h

Priyanka Jain (1):
      p1_p2_rdb: to set SQW/INT pin of RTC as INT line

Timur Tabi (1):
      powerpc/corenet_ds: display the RCW at boot

 arch/powerpc/cpu/mpc85xx/start.S             |   18 +++++-----
 arch/powerpc/cpu/mpc85xx/u-boot-nand.lds     |   49 +++++---------------------
 arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds |   12 +++---
 board/freescale/corenet_ds/corenet_ds.c      |   15 ++++++++
 board/freescale/p1_p2_rdb/p1_p2_rdb.c        |    4 ++-
 board/tqc/tqm85xx/tqm85xx.c                  |    2 +-
 boards.cfg                                   |    2 +-
 include/configs/MPC8536DS.h                  |   11 +++++-
 include/configs/MPC8569MDS.h                 |   12 +++++-
 include/configs/MPC8572DS.h                  |    1 +
 include/configs/P1022DS.h                    |    1 +
 include/configs/P1_P2_RDB.h                  |   14 ++++++--
 include/configs/P4080DS.h                    |    6 +--
 include/configs/corenet_ds.h                 |    6 +++-
 nand_spl/board/freescale/mpc8536ds/Makefile  |    4 +-
 nand_spl/board/freescale/mpc8569mds/Makefile |    4 +-
 nand_spl/board/freescale/p1_p2_rdb/Makefile  |    4 +-
 17 files changed, 89 insertions(+), 76 deletions(-)
Timur Tabi - Nov. 12, 2010, 3:55 p.m.
On Fri, Nov 12, 2010 at 9:49 AM, Kumar Gala <galak@kernel.crashing.org> wrote:

>      powerpc/8xxx: Enable e1000 driver on some FSL boards

I have an objection to this patch that I asked you about earlier, and
you never answered my question.
Kumar Gala - Nov. 12, 2010, 3:59 p.m.
On Nov 12, 2010, at 9:55 AM, Timur Tabi wrote:

> On Fri, Nov 12, 2010 at 9:49 AM, Kumar Gala <galak@kernel.crashing.org> wrote:
> 
>>      powerpc/8xxx: Enable e1000 driver on some FSL boards
> 
> I have an objection to this patch that I asked you about earlier, and
> you never answered my question.

I'm enabling it so we can use e1000 cards to test PCI.  I hear your objection and overrule it as maintainer.

- k
Wolfgang Denk - Nov. 12, 2010, 11:37 p.m.
Dear Kumar Gala,

In message <Pine.LNX.4.64.1011120948290.17327@localhost.localdomain> you wrote:
> The following changes since commit 0c0892be0d93a5a892b93739c5eb3bf692fed4ff:
> 
>   Merge branch 'master' of git://git.denx.de/u-boot-marvell (2010-10-29 22:03:00 +0200)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-mpc85xx master
> 
> Becky Bruce (1):
>       TQM85xx: Fix bug introduced by 83xx/85xx/86xx: LBC register cleanup
> 
> Haiying Wang (3):
>       powerpc/85xx: Fix lds for nand build
>       powerpc/85xx: rename CONFIG_SYS_TEXT_BASE to CONFIG_SYS_MONITOR_BASE
>       powerpc/85xx: add CONFIG_SYS_TEXT_BASE_SPL for 85xx nand spl build
> 
> Kumar Gala (5):
>       powerpc/8xxx: Fix merge issue with P2020DS DDR2 build config
>       powerpc/8xxx: Enable e1000 driver on some FSL boards
>       powerpc/corenet_ds: Enable DHCP suport
>       powerpc/corenet_ds: Move CONFIG_SYS_TEXT_BASE into corenet_ds.h
>       powerpc/p4080ds: Move ICS refclk define into P4080DS.h
> 
> Priyanka Jain (1):
>       p1_p2_rdb: to set SQW/INT pin of RTC as INT line
> 
> Timur Tabi (1):
>       powerpc/corenet_ds: display the RCW at boot
> 
>  arch/powerpc/cpu/mpc85xx/start.S             |   18 +++++-----
>  arch/powerpc/cpu/mpc85xx/u-boot-nand.lds     |   49 +++++---------------------
>  arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds |   12 +++---
>  board/freescale/corenet_ds/corenet_ds.c      |   15 ++++++++
>  board/freescale/p1_p2_rdb/p1_p2_rdb.c        |    4 ++-
>  board/tqc/tqm85xx/tqm85xx.c                  |    2 +-
>  boards.cfg                                   |    2 +-
>  include/configs/MPC8536DS.h                  |   11 +++++-
>  include/configs/MPC8569MDS.h                 |   12 +++++-
>  include/configs/MPC8572DS.h                  |    1 +
>  include/configs/P1022DS.h                    |    1 +
>  include/configs/P1_P2_RDB.h                  |   14 ++++++--
>  include/configs/P4080DS.h                    |    6 +--
>  include/configs/corenet_ds.h                 |    6 +++-
>  nand_spl/board/freescale/mpc8536ds/Makefile  |    4 +-
>  nand_spl/board/freescale/mpc8569mds/Makefile |    4 +-
>  nand_spl/board/freescale/p1_p2_rdb/Makefile  |    4 +-
>  17 files changed, 89 insertions(+), 76 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk