mbox

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

Message ID 1454413969-1593-1-git-send-email-andreas.devel@googlemail.com
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

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

Message

Andreas Bießmann Feb. 2, 2016, 11:52 a.m. UTC
Hi Tom,

please pull these changes into u-boot/master ... eventually before tagging rc1 ;)

Andreas

The following changes since commit 9e4de7fd4acc8f99b6d383c711d21c0159849629:

  Merge branch 'master' of http://git.denx.de/u-boot-sunxi (2016-01-26 17:45:37 -0500)

are available in the git repository at:

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

for you to fetch changes up to 37dadbca0c8b9bff00f892fd87a978cbe0a98b3a:

  board: atmel: sama5d2_xplained: add SPL support (2016-02-02 11:49:13 +0100)

----------------------------------------------------------------
Gregory CLEMENT (2):
      mmc: atmel: Properly fix clock configuration
      net: macb: Not all the GEM are gigabit capable

Josh Wu (5):
      atmel_nand: use nand ecc_{strength, step}_ds instead of our own function
      atmel_nand: add '\n' in the end of error message for better display
      atmel_nand: use the definition: PMECC_OOB_RESERVED_BYTES instead magic number
      atmel_nand_ecc: update pmecc registers according to sama5d2 chip
      atmel_nand: Add 32 bit ecc support for sama5d2 chip

Wenyou Yang (4):
      arm: at91/spl: mpddrc: add struct atmel_mpddrc_config
      arm: at91/spl: mpddrc: add mpddrc DDR3-SDRAM initialization
      arm: at91/spl: mpddrc: use IP version to check configuration
      board: atmel: sama5d2_xplained: add SPL support

 arch/arm/mach-at91/Kconfig                      |   1 +
 arch/arm/mach-at91/Makefile                     |   1 +
 arch/arm/mach-at91/include/mach/atmel_mpddrc.h  |  94 +++++++++++++++++++--
 arch/arm/mach-at91/include/mach/sama5d2.h       |  32 +++++++
 arch/arm/mach-at91/mpddrc.c                     | 107 ++++++++++++++++++++++--
 board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c |   4 +-
 board/atmel/at91sam9n12ek/at91sam9n12ek.c       |   4 +-
 board/atmel/at91sam9x5ek/at91sam9x5ek.c         |   4 +-
 board/atmel/sama5d2_xplained/sama5d2_xplained.c | 103 +++++++++++++++++++++++
 board/atmel/sama5d3_xplained/sama5d3_xplained.c |   4 +-
 board/atmel/sama5d3xek/sama5d3xek.c             |   4 +-
 board/atmel/sama5d4_xplained/sama5d4_xplained.c |   4 +-
 board/atmel/sama5d4ek/sama5d4ek.c               |   4 +-
 board/mini-box/picosam9g45/picosam9g45.c        |   4 +-
 board/siemens/corvus/board.c                    |   4 +-
 configs/sama5d2_xplained_mmc_defconfig          |   1 +
 configs/sama5d2_xplained_spiflash_defconfig     |   1 +
 drivers/mmc/gen_atmel_mci.c                     |  15 +++-
 drivers/mtd/nand/atmel_nand.c                   |  60 +++++--------
 drivers/mtd/nand/atmel_nand_ecc.h               |  36 +++++++-
 drivers/net/macb.c                              |  21 ++++-
 include/configs/sama5d2_xplained.h              |  39 +++++++++
 22 files changed, 465 insertions(+), 82 deletions(-)

Comments

Tom Rini Feb. 2, 2016, 3:49 p.m. UTC | #1
On Tue, Feb 02, 2016 at 12:52:49PM +0100, Andreas Bießmann wrote:

> Hi Tom,
> 
> please pull these changes into u-boot/master ... eventually before tagging rc1 ;)
> 
> Andreas
> 
> The following changes since commit 9e4de7fd4acc8f99b6d383c711d21c0159849629:
> 
>   Merge branch 'master' of http://git.denx.de/u-boot-sunxi (2016-01-26 17:45:37 -0500)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-atmel.git master
> 
> for you to fetch changes up to 37dadbca0c8b9bff00f892fd87a978cbe0a98b3a:
> 
>   board: atmel: sama5d2_xplained: add SPL support (2016-02-02 11:49:13 +0100)
> 

Applied to u-boot/master, thanks!