Patchwork [U-Boot] Pull request: u-boot-arm/master

login
register
mail settings
Submitter Albert ARIBAUD
Date June 21, 2011, 8:28 p.m.
Message ID <4E00FF02.4040105@aribaud.net>
Download mbox
Permalink /patch/101361/
State Accepted
Headers show

Pull-request

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

Comments

Albert ARIBAUD - June 21, 2011, 8:28 p.m.
Hi Wolfgang,

The following changes since commit 29b83d983392fcb5378b915ee2112bb48b8c05be:

   powerpc/p1022ds: set the clock-frequency prop only if the clock is 
enabled (2011-06-09 15:53:38 -0500)

are available in the git repository at:
   git://git.denx.de/u-boot-arm.git master

Aneesh V (6):
       omap1610h2: fix build breaks
       omap5912osk: fix build breaks
       omap1510inn: fix build breaks
       omap1610inn: fix build breaks
       omap2420h4: fix build breaks
       omap730p2: fix build breaks

Eric Benard (4):
       arm926ejs/at91/lowlevel_init.S: fix defines
       cpu9260/9G20: fix board support
       cpuat91: fix board support
       include/asm/arch-at91: update several .h files to ATMEL_xxx name 
scheme

Fabio Estevam (3):
       mx1ads: Fix build by using new relocation scheme
       imx31_phycore: Fix build by using new relocation scheme
       mx31pdk: Add DHCP command

Helmut Raiger (1):
       mxc_spi.c: typo fixed

Jens Scharsig (1):
       update arm/at91rm9200 work with rework rework110202

Reinhard Meyer (3):
       AT91 rework: fix at91sam(9260/9g20/9xe)ek board port to build again:
       AT91 rework: fix TOP9000 files to build again
       ATMEL spi_dataflash driver - fix to build again

Ryan Mallon (1):
       Add support for Bluewater Systems Snapper 9260/9G20 modules

Sergey Lapin (1):
       Build fix/update of AFEB9260

Stefano Babic (1):
       MX31: QONG: drop config.mk

andreas.devel@googlemail.com (2):
       at91_emac: fix compile warning
       macb: fix compile warning

  MAINTAINERS                                      |    5 +
  MAKEALL                                          |    3 -
  Makefile                                         |   45 -----
  arch/arm/cpu/arm920t/at91/reset.c                |    2 +-
  arch/arm/cpu/arm920t/at91/timer.c                |   12 +-
  arch/arm/cpu/arm926ejs/at91/lowlevel_init.S      |   24 ++--
  arch/arm/include/asm/arch-at91/at91_matrix.h     |   10 +-
  arch/arm/include/asm/arch-at91/at91_mc.h         |   12 +-
  arch/arm/include/asm/arch-at91/at91_pio.h        |   14 +-
  arch/arm/include/asm/arch-at91/at91_pmc.h        |   10 +-
  arch/arm/include/asm/arch-at91/at91_rstc.h       |    2 +-
  arch/arm/include/asm/arch-at91/at91_wdt.h        |    2 +-
  arch/arm/include/asm/arch-at91/at91rm9200.h      |  209 
++++++++++++----------
  arch/arm/include/asm/arch-at91/at91sam9260.h     |    1 +
  arch/arm/include/asm/arch-at91/at91sam9261.h     |    1 +
  arch/arm/include/asm/arch-at91/at91sam9263.h     |    1 +
  arch/arm/include/asm/arch-at91/at91sam9_sdramc.h |   30 ++--
  arch/arm/include/asm/arch-at91/at91sam9_smc.h    |   12 +-
  board/BuS/eb_cpux9k2/cpux9k2.c                   |   52 +++---
  board/afeb9260/afeb9260.c                        |  101 ++++++-----
  board/atmel/at91rm9200ek/at91rm9200ek.c          |    4 +-
  board/atmel/at91rm9200ek/led.c                   |   22 ++-
  board/atmel/at91sam9260ek/at91sam9260ek.c        |  127 +++++++------
  board/atmel/at91sam9260ek/config.mk              |    1 -
  board/atmel/at91sam9260ek/led.c                  |    8 +-
  board/bluewater/snapper9260/Makefile             |   53 ++++++
  board/bluewater/snapper9260/snapper9260.c        |  169 +++++++++++++++++
  board/davedenx/qong/config.mk                    |    3 -
  board/emk/top9000/top9000.c                      |   64 ++++---
  board/eukrea/cpu9260/cpu9260.c                   |   33 ++--
  board/eukrea/cpu9260/led.c                       |    6 +-
  board/eukrea/cpuat91/cpuat91.c                   |    6 +-
  board/imx31_phycore/config.mk                    |    1 -
  board/imx31_phycore/imx31_phycore.c              |   20 ++-
  board/mx1ads/config.mk                           |   25 ---
  board/mx1ads/mx1ads.c                            |   27 ++-
  boards.cfg                                       |    9 +
  drivers/net/at91_emac.c                          |   44 +++---
  drivers/net/macb.c                               |    5 +-
  drivers/spi/atmel_dataflash_spi.c                |    3 +-
  drivers/spi/mxc_spi.c                            |    2 +-
  include/configs/afeb9260.h                       |   78 +++++----
  include/configs/at91rm9200ek.h                   |    5 +-
  include/configs/at91sam9260ek.h                  |  107 +++++++-----
  include/configs/cpu9260.h                        |   11 +-
  include/configs/eb_cpux9k2.h                     |   23 ++--
  include/configs/imx31_phycore.h                  |   12 ++
  include/configs/mx1ads.h                         |   10 +
  include/configs/mx31pdk.h                        |    1 +
  include/configs/omap1510inn.h                    |    5 +
  include/configs/omap1610h2.h                     |    5 +
  include/configs/omap1610inn.h                    |    5 +
  include/configs/omap2420h4.h                     |    4 +
  include/configs/omap5912osk.h                    |    5 +
  include/configs/omap730p2.h                      |    5 +
  include/configs/qong.h                           |    4 +-
  include/configs/snapper9260.h                    |  191 
++++++++++++++++++++
  include/configs/top9000.h                        |   30 ++--
  58 files changed, 1084 insertions(+), 597 deletions(-)
  delete mode 100644 board/atmel/at91sam9260ek/config.mk
  create mode 100644 board/bluewater/snapper9260/Makefile
  create mode 100644 board/bluewater/snapper9260/snapper9260.c
  delete mode 100644 board/davedenx/qong/config.mk
  delete mode 100644 board/imx31_phycore/config.mk
  delete mode 100644 board/mx1ads/config.mk
  create mode 100644 include/configs/snapper9260.h

Amicalement,
Wolfgang Denk - June 22, 2011, 9:17 a.m.
Dear Albert ARIBAUD,

In message <4E00FF02.4040105@aribaud.net> you wrote:
> Hi Wolfgang,
> 
> The following changes since commit 29b83d983392fcb5378b915ee2112bb48b8c05be:
> 
>    powerpc/p1022ds: set the clock-frequency prop only if the clock is 
> enabled (2011-06-09 15:53:38 -0500)
> 
> are available in the git repository at:
>    git://git.denx.de/u-boot-arm.git master
> 
> Aneesh V (6):
>        omap1610h2: fix build breaks
>        omap5912osk: fix build breaks
>        omap1510inn: fix build breaks
>        omap1610inn: fix build breaks
>        omap2420h4: fix build breaks
>        omap730p2: fix build breaks
> 
> Eric Benard (4):
>        arm926ejs/at91/lowlevel_init.S: fix defines
>        cpu9260/9G20: fix board support
>        cpuat91: fix board support
>        include/asm/arch-at91: update several .h files to ATMEL_xxx name 
> scheme
> 
> Fabio Estevam (3):
>        mx1ads: Fix build by using new relocation scheme
>        imx31_phycore: Fix build by using new relocation scheme
>        mx31pdk: Add DHCP command
> 
> Helmut Raiger (1):
>        mxc_spi.c: typo fixed
> 
> Jens Scharsig (1):
>        update arm/at91rm9200 work with rework rework110202
> 
> Reinhard Meyer (3):
>        AT91 rework: fix at91sam(9260/9g20/9xe)ek board port to build again:
>        AT91 rework: fix TOP9000 files to build again
>        ATMEL spi_dataflash driver - fix to build again
> 
> Ryan Mallon (1):
>        Add support for Bluewater Systems Snapper 9260/9G20 modules
> 
> Sergey Lapin (1):
>        Build fix/update of AFEB9260
> 
> Stefano Babic (1):
>        MX31: QONG: drop config.mk
> 
> andreas.devel@googlemail.com (2):
>        at91_emac: fix compile warning
>        macb: fix compile warning
> 
>   MAINTAINERS                                      |    5 +
>   MAKEALL                                          |    3 -
>   Makefile                                         |   45 -----
>   arch/arm/cpu/arm920t/at91/reset.c                |    2 +-
>   arch/arm/cpu/arm920t/at91/timer.c                |   12 +-
>   arch/arm/cpu/arm926ejs/at91/lowlevel_init.S      |   24 ++--
>   arch/arm/include/asm/arch-at91/at91_matrix.h     |   10 +-
>   arch/arm/include/asm/arch-at91/at91_mc.h         |   12 +-
>   arch/arm/include/asm/arch-at91/at91_pio.h        |   14 +-
>   arch/arm/include/asm/arch-at91/at91_pmc.h        |   10 +-
>   arch/arm/include/asm/arch-at91/at91_rstc.h       |    2 +-
>   arch/arm/include/asm/arch-at91/at91_wdt.h        |    2 +-
>   arch/arm/include/asm/arch-at91/at91rm9200.h      |  209 
> ++++++++++++----------
>   arch/arm/include/asm/arch-at91/at91sam9260.h     |    1 +
>   arch/arm/include/asm/arch-at91/at91sam9261.h     |    1 +
>   arch/arm/include/asm/arch-at91/at91sam9263.h     |    1 +
>   arch/arm/include/asm/arch-at91/at91sam9_sdramc.h |   30 ++--
>   arch/arm/include/asm/arch-at91/at91sam9_smc.h    |   12 +-
>   board/BuS/eb_cpux9k2/cpux9k2.c                   |   52 +++---
>   board/afeb9260/afeb9260.c                        |  101 ++++++-----
>   board/atmel/at91rm9200ek/at91rm9200ek.c          |    4 +-
>   board/atmel/at91rm9200ek/led.c                   |   22 ++-
>   board/atmel/at91sam9260ek/at91sam9260ek.c        |  127 +++++++------
>   board/atmel/at91sam9260ek/config.mk              |    1 -
>   board/atmel/at91sam9260ek/led.c                  |    8 +-
>   board/bluewater/snapper9260/Makefile             |   53 ++++++
>   board/bluewater/snapper9260/snapper9260.c        |  169 +++++++++++++++++
>   board/davedenx/qong/config.mk                    |    3 -
>   board/emk/top9000/top9000.c                      |   64 ++++---
>   board/eukrea/cpu9260/cpu9260.c                   |   33 ++--
>   board/eukrea/cpu9260/led.c                       |    6 +-
>   board/eukrea/cpuat91/cpuat91.c                   |    6 +-
>   board/imx31_phycore/config.mk                    |    1 -
>   board/imx31_phycore/imx31_phycore.c              |   20 ++-
>   board/mx1ads/config.mk                           |   25 ---
>   board/mx1ads/mx1ads.c                            |   27 ++-
>   boards.cfg                                       |    9 +
>   drivers/net/at91_emac.c                          |   44 +++---
>   drivers/net/macb.c                               |    5 +-
>   drivers/spi/atmel_dataflash_spi.c                |    3 +-
>   drivers/spi/mxc_spi.c                            |    2 +-
>   include/configs/afeb9260.h                       |   78 +++++----
>   include/configs/at91rm9200ek.h                   |    5 +-
>   include/configs/at91sam9260ek.h                  |  107 +++++++-----
>   include/configs/cpu9260.h                        |   11 +-
>   include/configs/eb_cpux9k2.h                     |   23 ++--
>   include/configs/imx31_phycore.h                  |   12 ++
>   include/configs/mx1ads.h                         |   10 +
>   include/configs/mx31pdk.h                        |    1 +
>   include/configs/omap1510inn.h                    |    5 +
>   include/configs/omap1610h2.h                     |    5 +
>   include/configs/omap1610inn.h                    |    5 +
>   include/configs/omap2420h4.h                     |    4 +
>   include/configs/omap5912osk.h                    |    5 +
>   include/configs/omap730p2.h                      |    5 +
>   include/configs/qong.h                           |    4 +-
>   include/configs/snapper9260.h                    |  191 
> ++++++++++++++++++++
>   include/configs/top9000.h                        |   30 ++--
>   58 files changed, 1084 insertions(+), 597 deletions(-)
>   delete mode 100644 board/atmel/at91sam9260ek/config.mk
>   create mode 100644 board/bluewater/snapper9260/Makefile
>   create mode 100644 board/bluewater/snapper9260/snapper9260.c
>   delete mode 100644 board/davedenx/qong/config.mk
>   delete mode 100644 board/imx31_phycore/config.mk
>   delete mode 100644 board/mx1ads/config.mk
>   create mode 100644 include/configs/snapper9260.h

Applied, thanks.

Best regards,

Wolfgang Denk
Wolfgang Denk - June 22, 2011, 12:18 p.m.
Dear Albert ARIBAUD,

In message <4E00FF02.4040105@aribaud.net> you wrote:
> 
> The following changes since commit 29b83d983392fcb5378b915ee2112bb48b8c05be:

May I ask why for example my patch to remove the broken trab board has
not been included:

05/01 To:u-boot@lists.d  [PATCH] ARM: drop unsupported 'trab' board
             http://article.gmane.org/gmane.comp.boot-loaders.u-boot/98977


Is it OK with you that I pull this directly?

Best regards,

Wolfgang Denk
Albert ARIBAUD - June 22, 2011, 1:51 p.m.
Le 22/06/2011 14:18, Wolfgang Denk a écrit :
> Dear Albert ARIBAUD,
>
> In message<4E00FF02.4040105@aribaud.net>  you wrote:
>>
>> The following changes since commit 29b83d983392fcb5378b915ee2112bb48b8c05be:
>
> May I ask why for example my patch to remove the broken trab board has
> not been included:
>
> 05/01 To:u-boot@lists.d  [PATCH] ARM: drop unsupported 'trab' board
>               http://article.gmane.org/gmane.comp.boot-loaders.u-boot/98977
>
>
> Is it OK with you that I pull this directly?
>
> Best regards,
>
> Wolfgang Denk

Hi wolfgang,

Yes, it is.

Amicalement,