mbox

[U-Boot] Please pull u-boot-ti/master

Message ID 20120326173600.GF21518@bill-the-cat
State Superseded
Delegated to: Albert ARIBAUD
Headers show

Pull-request

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

Message

Tom Rini March 26, 2012, 5:36 p.m. UTC
On Mon, Mar 19, 2012 at 11:29:06AM -0700, Tom Rini wrote:
> Hello,
> 
> The following changes since commit 32ec258f829808dd7cf74fd83ba999fdaaeab715:
>   Marek Vasut (1):
>         IXP: Fix GPIO_INT_ACT_LOW_SET()
[snip]

This pull request is now updated as such:

The following changes since commit 32ec258f829808dd7cf74fd83ba999fdaaeab715:
  Marek Vasut (1):
        IXP: Fix GPIO_INT_ACT_LOW_SET()

are available in the git repository at:

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

Christian Riesch (1):
      calimain, enbw_cmc: Fix typo in comments

Grazvydas Ignotas (1):
      twl4030: fix potential power supply handling issues

Simon Schwarz (8):
      Add cmd_spl command
      devkit8000: add config for spl command
      omap-common: Add NAND SPL linux booting
      devkit8000/spl: init GPMC for dm9000 in SPL
      omap-common/spl: Add linux boot to SPL
      omap/spl: change output of spl_parse_image_header
      devkit8000: Implement and activate direct OS boot
      arm: Add Prep subcommand support to bootm

Stefano Babic (8):
      Add cache functions to SPL for armv7
      OMAP3: SPL: do not call I2C init if no I2C is set.
      SPL: call cleanup_before_linux() before booting Linux
      OMAP3: twister: add support to boot Linux from SPL
      NAND: TI: fix warnings in omap_gpmc.c
      OMAP3: mt_ventoux: updated timing for FPGA
      OMAP3: mt_ventoux: sets its own mtdparts
      Davinci: ea20: use gpio framework to access gpios

Tom Rini (1):
      cam_enc_4xx: Rename 'images' to 'imgs'

jacopo mondi (1):
      omap3_spi: receive transmit mode

 arch/arm/cpu/armv7/Makefile               |    2 -
 arch/arm/cpu/armv7/cpu.c                  |    2 +
 arch/arm/cpu/armv7/omap-common/spl.c      |   46 ++++-
 arch/arm/cpu/armv7/omap-common/spl_nand.c |   47 ++++-
 arch/arm/cpu/armv7/omap3/board.c          |    2 +
 arch/arm/include/asm/bootm.h              |   26 +++
 arch/arm/include/asm/omap_common.h        |    2 +
 arch/arm/lib/Makefile                     |    5 +-
 arch/arm/lib/bootm.c                      |  341 +++++++++++++++--------------
 board/ait/cam_enc_4xx/cam_enc_4xx.c       |   48 ++--
 board/davinci/ea20/ea20.c                 |   38 +---
 board/enbw/enbw_cmc/enbw_cmc.c            |    2 +-
 board/omicron/calimain/calimain.c         |    2 +-
 board/technexion/twister/twister.c        |   23 ++
 board/teejet/mt_ventoux/mt_ventoux.h      |   11 +-
 board/timll/devkit8000/devkit8000.c       |   37 +++
 common/Makefile                           |    1 +
 common/cmd_spl.c                          |  188 ++++++++++++++++
 doc/README.commands.spl                   |   31 +++
 drivers/mtd/nand/omap_gpmc.c              |   14 +-
 drivers/power/twl4030.c                   |   18 ++-
 drivers/spi/omap3_spi.c                   |   66 ++++++-
 drivers/spi/omap3_spi.h                   |    2 +
 include/cmd_spl.h                         |   31 +++
 include/configs/devkit8000.h              |   15 +-
 include/configs/ea20.h                    |    2 +
 include/configs/mt_ventoux.h              |   10 +
 include/configs/twister.h                 |   12 +
 include/image.h                           |    2 +
 29 files changed, 777 insertions(+), 249 deletions(-)
 create mode 100644 arch/arm/include/asm/bootm.h
 create mode 100644 common/cmd_spl.c
 create mode 100644 doc/README.commands.spl
 create mode 100644 include/cmd_spl.h

Comments

Albert ARIBAUD March 26, 2012, 8:45 p.m. UTC | #1
Hi Tom,

Le 26/03/2012 19:36, Tom Rini a écrit :
> On Mon, Mar 19, 2012 at 11:29:06AM -0700, Tom Rini wrote:
>> Hello,
>>
>> The following changes since commit 32ec258f829808dd7cf74fd83ba999fdaaeab715:
>>    Marek Vasut (1):
>>          IXP: Fix GPIO_INT_ACT_LOW_SET()
> [snip]
>
> This pull request is now updated as such:
>
> The following changes since commit 32ec258f829808dd7cf74fd83ba999fdaaeab715:
>    Marek Vasut (1):
>          IXP: Fix GPIO_INT_ACT_LOW_SET()
>
> are available in the git repository at:
>
>    git://git.denx.de/u-boot-ti master
>
> Christian Riesch (1):
>        calimain, enbw_cmc: Fix typo in comments
>
> Grazvydas Ignotas (1):
>        twl4030: fix potential power supply handling issues
>
> Simon Schwarz (8):
>        Add cmd_spl command
>        devkit8000: add config for spl command
>        omap-common: Add NAND SPL linux booting
>        devkit8000/spl: init GPMC for dm9000 in SPL
>        omap-common/spl: Add linux boot to SPL
>        omap/spl: change output of spl_parse_image_header
>        devkit8000: Implement and activate direct OS boot
>        arm: Add Prep subcommand support to bootm
>
> Stefano Babic (8):
>        Add cache functions to SPL for armv7
>        OMAP3: SPL: do not call I2C init if no I2C is set.
>        SPL: call cleanup_before_linux() before booting Linux
>        OMAP3: twister: add support to boot Linux from SPL
>        NAND: TI: fix warnings in omap_gpmc.c
>        OMAP3: mt_ventoux: updated timing for FPGA
>        OMAP3: mt_ventoux: sets its own mtdparts
>        Davinci: ea20: use gpio framework to access gpios
>
> Tom Rini (1):
>        cam_enc_4xx: Rename 'images' to 'imgs'
>
> jacopo mondi (1):
>        omap3_spi: receive transmit mode
>
>   arch/arm/cpu/armv7/Makefile               |    2 -
>   arch/arm/cpu/armv7/cpu.c                  |    2 +
>   arch/arm/cpu/armv7/omap-common/spl.c      |   46 ++++-
>   arch/arm/cpu/armv7/omap-common/spl_nand.c |   47 ++++-
>   arch/arm/cpu/armv7/omap3/board.c          |    2 +
>   arch/arm/include/asm/bootm.h              |   26 +++
>   arch/arm/include/asm/omap_common.h        |    2 +
>   arch/arm/lib/Makefile                     |    5 +-
>   arch/arm/lib/bootm.c                      |  341 +++++++++++++++--------------
>   board/ait/cam_enc_4xx/cam_enc_4xx.c       |   48 ++--
>   board/davinci/ea20/ea20.c                 |   38 +---
>   board/enbw/enbw_cmc/enbw_cmc.c            |    2 +-
>   board/omicron/calimain/calimain.c         |    2 +-
>   board/technexion/twister/twister.c        |   23 ++
>   board/teejet/mt_ventoux/mt_ventoux.h      |   11 +-
>   board/timll/devkit8000/devkit8000.c       |   37 +++
>   common/Makefile                           |    1 +
>   common/cmd_spl.c                          |  188 ++++++++++++++++
>   doc/README.commands.spl                   |   31 +++
>   drivers/mtd/nand/omap_gpmc.c              |   14 +-
>   drivers/power/twl4030.c                   |   18 ++-
>   drivers/spi/omap3_spi.c                   |   66 ++++++-
>   drivers/spi/omap3_spi.h                   |    2 +
>   include/cmd_spl.h                         |   31 +++
>   include/configs/devkit8000.h              |   15 +-
>   include/configs/ea20.h                    |    2 +
>   include/configs/mt_ventoux.h              |   10 +
>   include/configs/twister.h                 |   12 +
>   include/image.h                           |    2 +
>   29 files changed, 777 insertions(+), 249 deletions(-)
>   create mode 100644 arch/arm/include/asm/bootm.h
>   create mode 100644 common/cmd_spl.c
>   create mode 100644 doc/README.commands.spl
>   create mode 100644 include/cmd_spl.h

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

Amicalement,
Albert ARIBAUD March 26, 2012, 9:09 p.m. UTC | #2
Le 26/03/2012 22:45, Albert ARIBAUD a écrit :
> Hi Tom,
>
> Le 26/03/2012 19:36, Tom Rini a écrit :
>> On Mon, Mar 19, 2012 at 11:29:06AM -0700, Tom Rini wrote:
>>> Hello,
>>>
>>> The following changes since commit
>>> 32ec258f829808dd7cf74fd83ba999fdaaeab715:
>>> Marek Vasut (1):
>>> IXP: Fix GPIO_INT_ACT_LOW_SET()
>> [snip]
>>
>> This pull request is now updated as such:
>>
>> The following changes since commit
>> 32ec258f829808dd7cf74fd83ba999fdaaeab715:
>> Marek Vasut (1):
>> IXP: Fix GPIO_INT_ACT_LOW_SET()
>>
>> are available in the git repository at:
>>
>> git://git.denx.de/u-boot-ti master
>>
>> Christian Riesch (1):
>> calimain, enbw_cmc: Fix typo in comments
>>
>> Grazvydas Ignotas (1):
>> twl4030: fix potential power supply handling issues
>>
>> Simon Schwarz (8):
>> Add cmd_spl command
>> devkit8000: add config for spl command
>> omap-common: Add NAND SPL linux booting
>> devkit8000/spl: init GPMC for dm9000 in SPL
>> omap-common/spl: Add linux boot to SPL
>> omap/spl: change output of spl_parse_image_header
>> devkit8000: Implement and activate direct OS boot
>> arm: Add Prep subcommand support to bootm
>>
>> Stefano Babic (8):
>> Add cache functions to SPL for armv7
>> OMAP3: SPL: do not call I2C init if no I2C is set.
>> SPL: call cleanup_before_linux() before booting Linux
>> OMAP3: twister: add support to boot Linux from SPL
>> NAND: TI: fix warnings in omap_gpmc.c
>> OMAP3: mt_ventoux: updated timing for FPGA
>> OMAP3: mt_ventoux: sets its own mtdparts
>> Davinci: ea20: use gpio framework to access gpios
>>
>> Tom Rini (1):
>> cam_enc_4xx: Rename 'images' to 'imgs'
>>
>> jacopo mondi (1):
>> omap3_spi: receive transmit mode
>>
>> arch/arm/cpu/armv7/Makefile | 2 -
>> arch/arm/cpu/armv7/cpu.c | 2 +
>> arch/arm/cpu/armv7/omap-common/spl.c | 46 ++++-
>> arch/arm/cpu/armv7/omap-common/spl_nand.c | 47 ++++-
>> arch/arm/cpu/armv7/omap3/board.c | 2 +
>> arch/arm/include/asm/bootm.h | 26 +++
>> arch/arm/include/asm/omap_common.h | 2 +
>> arch/arm/lib/Makefile | 5 +-
>> arch/arm/lib/bootm.c | 341 +++++++++++++++--------------
>> board/ait/cam_enc_4xx/cam_enc_4xx.c | 48 ++--
>> board/davinci/ea20/ea20.c | 38 +---
>> board/enbw/enbw_cmc/enbw_cmc.c | 2 +-
>> board/omicron/calimain/calimain.c | 2 +-
>> board/technexion/twister/twister.c | 23 ++
>> board/teejet/mt_ventoux/mt_ventoux.h | 11 +-
>> board/timll/devkit8000/devkit8000.c | 37 +++
>> common/Makefile | 1 +
>> common/cmd_spl.c | 188 ++++++++++++++++
>> doc/README.commands.spl | 31 +++
>> drivers/mtd/nand/omap_gpmc.c | 14 +-
>> drivers/power/twl4030.c | 18 ++-
>> drivers/spi/omap3_spi.c | 66 ++++++-
>> drivers/spi/omap3_spi.h | 2 +
>> include/cmd_spl.h | 31 +++
>> include/configs/devkit8000.h | 15 +-
>> include/configs/ea20.h | 2 +
>> include/configs/mt_ventoux.h | 10 +
>> include/configs/twister.h | 12 +
>> include/image.h | 2 +
>> 29 files changed, 777 insertions(+), 249 deletions(-)
>> create mode 100644 arch/arm/include/asm/bootm.h
>> create mode 100644 common/cmd_spl.c
>> create mode 100644 doc/README.commands.spl
>> create mode 100644 include/cmd_spl.h
>
> Applied to u-boot-arm/master, thanks.
>
> Amicalement,

Correction: the "arm: Add Prep subcommand support to bootm" commit does 
not apply cleanly to the u-boot tree. I am rolling by my tree. Please 
rebase on it and re-request a pull.

Amicalement,