mbox

[U-Boot,PULL] u-boot-atmel/master -> u-boot-arm/master

Message ID 1394391013-27970-1-git-send-email-andreas.devel@googlemail.com
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Pull-request

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

Message

Andreas Bießmann March 9, 2014, 6:50 p.m. UTC
Dear Albert Aribaud,

please pull the following changes from u-boot-atmel/master into
u-boot-arm/master.

The following changes since commit de4fdfc1f22d70c23be5443dafacb8163023f9b1:

  Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master' (2014-03-07 14:32:42 +0100)

are available in the git repository at:


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

for you to fetch changes up to 27019e4a949fc3be2e895ac20839c4d4d119f902:

  arm: atmel: sama5d3: add nand spl boot support (2014-03-09 19:19:13 +0100)

----------------------------------------------------------------
Andreas Henriksson (2):
      at91sam9263ek: add mmc support
      at91 gpio: fix typo in compatibility macro

Bo Shen (4):
      ARM: atmel: add sama5d3 Xplained board support
      arm: atmel: sama5d3: add spi spl boot support
      mtd: nand: atmel: prepare for nand spl boot support
      arm: atmel: sama5d3: add nand spl boot support

 arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c |   25 +++
 arch/arm/cpu/at91-common/spl.c                    |    4 +
 arch/arm/include/asm/arch-at91/gpio.h             |    2 +-
 arch/arm/include/asm/arch-at91/spl.h              |    4 +
 board/atmel/at91sam9263ek/at91sam9263ek.c         |   10 +
 board/atmel/sama5d3_xplained/Makefile             |   15 ++
 board/atmel/sama5d3_xplained/sama5d3_xplained.c   |  130 +++++++++++++
 board/atmel/sama5d3xek/sama5d3xek.c               |    4 +
 boards.cfg                                        |    2 +
 drivers/mtd/nand/atmel_nand.c                     |  208 +++++++++++++++++++++
 include/configs/at91sam9263ek.h                   |   13 ++
 include/configs/sama5d3_xplained.h                |  203 ++++++++++++++++++++
 include/configs/sama5d3xek.h                      |   23 +++
 include/nand.h                                    |    6 +
 14 files changed, 648 insertions(+), 1 deletion(-)
 create mode 100644 board/atmel/sama5d3_xplained/Makefile
 create mode 100644 board/atmel/sama5d3_xplained/sama5d3_xplained.c
 create mode 100644 include/configs/sama5d3_xplained.h

Comments

Albert ARIBAUD March 10, 2014, 8:09 a.m. UTC | #1
Hi Andreas,

On Sun,  9 Mar 2014 19:50:12 +0100, Andreas Bießmann
<andreas.devel@googlemail.com> wrote:

> Dear Albert Aribaud,
> 
> please pull the following changes from u-boot-atmel/master into
> u-boot-arm/master.
> 
> The following changes since commit de4fdfc1f22d70c23be5443dafacb8163023f9b1:
> 
>   Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master' (2014-03-07 14:32:42 +0100)
> 
> are available in the git repository at:
> 
> 
>   git://git.denx.de/u-boot-atmel.git master
> 
> for you to fetch changes up to 27019e4a949fc3be2e895ac20839c4d4d119f902:
> 
>   arm: atmel: sama5d3: add nand spl boot support (2014-03-09 19:19:13 +0100)
> 
> ----------------------------------------------------------------
> Andreas Henriksson (2):
>       at91sam9263ek: add mmc support
>       at91 gpio: fix typo in compatibility macro
> 
> Bo Shen (4):
>       ARM: atmel: add sama5d3 Xplained board support
>       arm: atmel: sama5d3: add spi spl boot support
>       mtd: nand: atmel: prepare for nand spl boot support
>       arm: atmel: sama5d3: add nand spl boot support
> 
>  arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c |   25 +++
>  arch/arm/cpu/at91-common/spl.c                    |    4 +
>  arch/arm/include/asm/arch-at91/gpio.h             |    2 +-
>  arch/arm/include/asm/arch-at91/spl.h              |    4 +
>  board/atmel/at91sam9263ek/at91sam9263ek.c         |   10 +
>  board/atmel/sama5d3_xplained/Makefile             |   15 ++
>  board/atmel/sama5d3_xplained/sama5d3_xplained.c   |  130 +++++++++++++
>  board/atmel/sama5d3xek/sama5d3xek.c               |    4 +
>  boards.cfg                                        |    2 +
>  drivers/mtd/nand/atmel_nand.c                     |  208 +++++++++++++++++++++
>  include/configs/at91sam9263ek.h                   |   13 ++
>  include/configs/sama5d3_xplained.h                |  203 ++++++++++++++++++++
>  include/configs/sama5d3xek.h                      |   23 +++
>  include/nand.h                                    |    6 +
>  14 files changed, 648 insertions(+), 1 deletion(-)
>  create mode 100644 board/atmel/sama5d3_xplained/Makefile
>  create mode 100644 board/atmel/sama5d3_xplained/sama5d3_xplained.c
>  create mode 100644 include/configs/sama5d3_xplained.h

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

Amicalement,