Patchwork [U-Boot,PULL] U-Boot-pxa pull request

login
register
mail settings
Submitter Marek Vasut
Date May 27, 2011, 2:56 p.m.
Message ID <201105271656.35576.marek.vasut@gmail.com>
Download mbox
Permalink /patch/97693/
State Accepted
Headers show

Pull-request

git://git.denx.de/u-boot-pxa.git ixp

Comments

Marek Vasut - May 27, 2011, 2:56 p.m.
Hi,
please pull my git://git.denx.de/u-boot-pxa ixp branch into your u-
boot/master branch. Thanks

These are mostly the IXP changes + I added the fix I promissed you half a year 
ago ... damn the time runs fast :-/

Cheers

The following changes since commit 5d1ee00b1fe1180503f6dfc10e87a6c6e74778f3:

  .gitignore: update list of u-boot.* files and add *.bin (2011-05-22 23:46:26 
+0200)

are available in the git repository at:
  git://git.denx.de/u-boot-pxa.git ixp

Marek Vasut (1):
      Move wepep250,delta,xsengine to scrapyard

Michael Schwingen (17):
      add XScale sub architecture (IXP/PXA) to maintainer list
      add support for IXP42x Rev. B1 and newer
      trigger hardware watchdog in IXP42x serial driver
      Fix IXP code to work after relocation was added
      fix "depend" target in npe directory
      support CONFIG_SYS_LDSCRIPT on ARM
      use -ffunction-sections / --gc-sections on IXP42x
      update/fix AcTux1 board
      update/fix AcTux2 board
      update/fix AcTux3 board
      update/fix AcTux4 board
      IXP NPE: add support for fixed-speed MII ports
      add dvlhost (dLAN 200 AV Wireless G) board
      update/fix IXDP425 / IXDPG425 boards
      update/fix PDNB3 board
      IXP42x PCI rewrite
      run arm_pci_init after relocation

 MAINTAINERS                               |   49 ++--
 arch/arm/config.mk                        |    7 +
 arch/arm/cpu/ixp/config.mk                |    5 +
 arch/arm/cpu/ixp/cpu.c                    |    5 -
 arch/arm/cpu/ixp/npe/Makefile             |    1 +
 arch/arm/cpu/ixp/npe/npe.c                |   74 +++--
 arch/arm/cpu/ixp/start.S                  |   59 +---
 arch/arm/cpu/ixp/timer.c                  |  124 +++---
 arch/arm/cpu/ixp/u-boot.lds               |    8 +-
 arch/arm/include/asm/arch-ixp/ixp425.h    |    5 +-
 arch/arm/include/asm/arch-ixp/ixp425pci.h |  130 +------
 arch/arm/include/asm/global_data.h        |    3 +
 arch/arm/lib/board.c                      |    6 +-
 board/actux1/actux1.c                     |  105 +++---
 board/actux1/config.mk                    |    4 -
 board/actux1/u-boot.lds                   |   41 ++-
 board/actux2/actux2.c                     |   93 +++---
 board/actux2/config.mk                    |    4 -
 board/actux2/u-boot.lds                   |   46 ++-
 board/actux3/actux3.c                     |  120 +++---
 board/actux3/config.mk                    |    4 -
 board/actux3/u-boot.lds                   |   52 ++-
 board/actux4/actux4.c                     |  103 +++--
 board/actux4/config.mk                    |    4 -
 board/dvlhost/Makefile                    |   50 +++
 board/dvlhost/dvlhost.c                   |  130 ++++++
 board/dvlhost/dvlhost_hw.h                |   47 +++
 board/dvlhost/u-boot.lds                  |   87 ++++
 board/dvlhost/watchdog.c                  |   43 ++
 board/ixdp425/config.mk                   |    2 -
 board/ixdp425/flash.c                     |  427 --------------------
 board/ixdp425/ixdp425.c                   |  155 +++++++-
 board/prodrive/pdnb3/config.mk            |    2 -
 boards.cfg                                |    8 +-
 doc/README.scrapyard                      |    3 +
 drivers/pci/pci.c                         |    4 -
 drivers/pci/pci_indirect.c                |   13 +-
 drivers/pci/pci_ixp.c                     |  612 ++++++++++-------------------
 drivers/serial/serial_ixp.c               |    7 +-
 include/configs/actux1.h                  |   62 ++--
 include/configs/actux2.h                  |   35 ++-
 include/configs/actux3.h                  |   37 ++-
 include/configs/actux4.h                  |   39 ++-
 include/configs/dvlhost.h                 |  248 ++++++++++++
 include/configs/ixdp425.h                 |  196 +++++++---
 include/configs/ixdpg425.h                |   11 +-
 include/configs/pdnb3.h                   |   10 +-
 47 files changed, 1692 insertions(+), 1588 deletions(-)
 delete mode 100644 board/actux1/config.mk
 delete mode 100644 board/actux2/config.mk
 delete mode 100644 board/actux3/config.mk
 delete mode 100644 board/actux4/config.mk
 create mode 100644 board/dvlhost/Makefile
 create mode 100644 board/dvlhost/dvlhost.c
 create mode 100644 board/dvlhost/dvlhost_hw.h
 create mode 100644 board/dvlhost/u-boot.lds
 create mode 100644 board/dvlhost/watchdog.c
 delete mode 100644 board/ixdp425/config.mk
 delete mode 100644 board/ixdp425/flash.c
 delete mode 100644 board/prodrive/pdnb3/config.mk
 create mode 100644 include/configs/dvlhost.h
Albert ARIBAUD - June 23, 2011, 6:27 a.m.
Le 27/05/2011 16:56, Marek Vasut a écrit :
> Hi,
> please pull my git://git.denx.de/u-boot-pxa ixp branch into your u-
> boot/master branch. Thanks
>
> These are mostly the IXP changes + I added the fix I promissed you half a year
> ago ... damn the time runs fast :-/
>
> Cheers
>
> The following changes since commit 5d1ee00b1fe1180503f6dfc10e87a6c6e74778f3:
>
>    .gitignore: update list of u-boot.* files and add *.bin (2011-05-22 23:46:26
> +0200)
>
> are available in the git repository at:
>    git://git.denx.de/u-boot-pxa.git ixp
>
> Marek Vasut (1):
>        Move wepep250,delta,xsengine to scrapyard
>
> Michael Schwingen (17):
>        add XScale sub architecture (IXP/PXA) to maintainer list
>        add support for IXP42x Rev. B1 and newer
>        trigger hardware watchdog in IXP42x serial driver
>        Fix IXP code to work after relocation was added
>        fix "depend" target in npe directory
>        support CONFIG_SYS_LDSCRIPT on ARM
>        use -ffunction-sections / --gc-sections on IXP42x
>        update/fix AcTux1 board
>        update/fix AcTux2 board
>        update/fix AcTux3 board
>        update/fix AcTux4 board
>        IXP NPE: add support for fixed-speed MII ports
>        add dvlhost (dLAN 200 AV Wireless G) board
>        update/fix IXDP425 / IXDPG425 boards
>        update/fix PDNB3 board
>        IXP42x PCI rewrite
>        run arm_pci_init after relocation
>
>   MAINTAINERS                               |   49 ++--
>   arch/arm/config.mk                        |    7 +
>   arch/arm/cpu/ixp/config.mk                |    5 +
>   arch/arm/cpu/ixp/cpu.c                    |    5 -
>   arch/arm/cpu/ixp/npe/Makefile             |    1 +
>   arch/arm/cpu/ixp/npe/npe.c                |   74 +++--
>   arch/arm/cpu/ixp/start.S                  |   59 +---
>   arch/arm/cpu/ixp/timer.c                  |  124 +++---
>   arch/arm/cpu/ixp/u-boot.lds               |    8 +-
>   arch/arm/include/asm/arch-ixp/ixp425.h    |    5 +-
>   arch/arm/include/asm/arch-ixp/ixp425pci.h |  130 +------
>   arch/arm/include/asm/global_data.h        |    3 +
>   arch/arm/lib/board.c                      |    6 +-
>   board/actux1/actux1.c                     |  105 +++---
>   board/actux1/config.mk                    |    4 -
>   board/actux1/u-boot.lds                   |   41 ++-
>   board/actux2/actux2.c                     |   93 +++---
>   board/actux2/config.mk                    |    4 -
>   board/actux2/u-boot.lds                   |   46 ++-
>   board/actux3/actux3.c                     |  120 +++---
>   board/actux3/config.mk                    |    4 -
>   board/actux3/u-boot.lds                   |   52 ++-
>   board/actux4/actux4.c                     |  103 +++--
>   board/actux4/config.mk                    |    4 -
>   board/dvlhost/Makefile                    |   50 +++
>   board/dvlhost/dvlhost.c                   |  130 ++++++
>   board/dvlhost/dvlhost_hw.h                |   47 +++
>   board/dvlhost/u-boot.lds                  |   87 ++++
>   board/dvlhost/watchdog.c                  |   43 ++
>   board/ixdp425/config.mk                   |    2 -
>   board/ixdp425/flash.c                     |  427 --------------------
>   board/ixdp425/ixdp425.c                   |  155 +++++++-
>   board/prodrive/pdnb3/config.mk            |    2 -
>   boards.cfg                                |    8 +-
>   doc/README.scrapyard                      |    3 +
>   drivers/pci/pci.c                         |    4 -
>   drivers/pci/pci_indirect.c                |   13 +-
>   drivers/pci/pci_ixp.c                     |  612 ++++++++++-------------------
>   drivers/serial/serial_ixp.c               |    7 +-
>   include/configs/actux1.h                  |   62 ++--
>   include/configs/actux2.h                  |   35 ++-
>   include/configs/actux3.h                  |   37 ++-
>   include/configs/actux4.h                  |   39 ++-
>   include/configs/dvlhost.h                 |  248 ++++++++++++
>   include/configs/ixdp425.h                 |  196 +++++++---
>   include/configs/ixdpg425.h                |   11 +-
>   include/configs/pdnb3.h                   |   10 +-
>   47 files changed, 1692 insertions(+), 1588 deletions(-)
>   delete mode 100644 board/actux1/config.mk
>   delete mode 100644 board/actux2/config.mk
>   delete mode 100644 board/actux3/config.mk
>   delete mode 100644 board/actux4/config.mk
>   create mode 100644 board/dvlhost/Makefile
>   create mode 100644 board/dvlhost/dvlhost.c
>   create mode 100644 board/dvlhost/dvlhost_hw.h
>   create mode 100644 board/dvlhost/u-boot.lds
>   create mode 100644 board/dvlhost/watchdog.c
>   delete mode 100644 board/ixdp425/config.mk
>   delete mode 100644 board/ixdp425/flash.c
>   delete mode 100644 board/prodrive/pdnb3/config.mk
>   create mode 100644 include/configs/dvlhost.h

Applied (with a trivial merge on boards.cfg), thanks, and apologies for 
missing this!

Amicalement,