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

[Andreas Bießmann]

Hi Tom,

please pull the following into u-boot/master for 2016.07.

It contains the spl_boot_mode() change from Marek which was delegated partly
to you and partly to me on patchwork.
The rest is DT support for some Siemens boards which where sent before MW
close but missed in my last pull request. I hope you'll take it since it
touches only the three boards.

Compile tests are clean, except for them already broken in
4141e85bcd79c0b9b16def710e527f165107b7af:

01: kbuild: avoid race between dtbs and dt/dt.dtb targets
       arm:  +   omap3_overo igep0030_nand mx31pdk igep0020_nand socfpga_is1
       omap4_sdp4430 omap4_panda

(some section overflows with my toolchain and socfpga_is1 is broken for
CONFIG_BOOTDELAY change)

Andreas

The following changes since commit 4141e85bcd79c0b9b16def710e527f165107b7af:

  kbuild: avoid race between dtbs and dt/dt.dtb targets (2016-06-24 17:24:41 -0400)

are available in the git repository at:

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

for you to fetch changes up to 8e6e8221c78ed283a45f8598c65ffe4d287dcf42:

  arm: at91: taurus/axm: add DM and DTS support (2016-06-26 20:17:22 +0200)

----------------------------------------------------------------
Heiko Schocher (5):
      arm: at91: add CONFIG_AT91SAM9M10G45
      corvus DTS / DM support
      arm: at91: dts: Bring in dts files for AT91SAM9G20 and SAM9260
      arm: at91: smartweb: add DM and DTS support
      arm: at91: taurus/axm: add DM and DTS support

Marek Vasut (2):
      common: Pass the boot device into spl_boot_mode()
      ARM: at91: Don't invoke spl_boot_device() twice

 arch/arm/cpu/arm1136/mx35/generic.c           |    2 +-
 arch/arm/cpu/armv7/ls102xa/spl.c              |    2 +-
 arch/arm/cpu/armv7/omap-common/boot-common.c  |    2 +-
 arch/arm/cpu/armv8/fsl-layerscape/spl.c       |    2 +-
 arch/arm/cpu/armv8/zynqmp/spl.c               |    2 +-
 arch/arm/dts/Makefile                         |    6 +-
 arch/arm/dts/at91sam9260-smartweb.dts         |  110 +++
 arch/arm/dts/at91sam9260.dtsi                 | 1034 +++++++++++++++++++++++++
 arch/arm/dts/at91sam9261.dtsi                 |  876 +++++++++++++++++++++
 arch/arm/dts/at91sam9263.dtsi                 | 1034 +++++++++++++++++++++++++
 arch/arm/dts/at91sam9g20-taurus.dts           |  119 +++
 arch/arm/dts/at91sam9g20.dtsi                 |   68 ++
 arch/arm/dts/at91sam9g45-corvus.dts           |  108 +++
 arch/arm/imx-common/spl.c                     |    2 +-
 arch/arm/mach-at91/Kconfig                    |   12 +
 arch/arm/mach-at91/include/mach/at91_matrix.h |   26 +-
 arch/arm/mach-at91/spl.c                      |    4 +-
 arch/arm/mach-davinci/spl.c                   |    2 +-
 arch/arm/mach-mvebu/spl.c                     |    2 +-
 arch/arm/mach-rockchip/rk3288-board-spl.c     |    2 +-
 arch/arm/mach-socfpga/spl.c                   |    2 +-
 arch/arm/mach-sunxi/board.c                   |    2 +-
 arch/arm/mach-uniphier/boot-mode/boot-mode.c  |    2 +-
 arch/arm/mach-zynq/spl.c                      |    2 +-
 board/siemens/corvus/board.c                  |   41 +-
 board/siemens/smartweb/smartweb.c             |   32 +-
 board/siemens/taurus/taurus.c                 |   25 +
 common/spl/spl_mmc.c                          |    2 +-
 configs/axm_defconfig                         |    5 +-
 configs/corvus_defconfig                      |    8 +
 configs/smartweb_defconfig                    |    7 +-
 configs/taurus_defconfig                      |    5 +-
 include/configs/corvus.h                      |    2 +-
 include/configs/smartweb.h                    |    6 +-
 include/configs/taurus.h                      |    2 +-
 include/spl.h                                 |    2 +-
 36 files changed, 3511 insertions(+), 49 deletions(-)
 create mode 100644 arch/arm/dts/at91sam9260-smartweb.dts
 create mode 100644 arch/arm/dts/at91sam9260.dtsi
 create mode 100644 arch/arm/dts/at91sam9261.dtsi
 create mode 100644 arch/arm/dts/at91sam9263.dtsi
 create mode 100644 arch/arm/dts/at91sam9g20-taurus.dts
 create mode 100644 arch/arm/dts/at91sam9g20.dtsi
 create mode 100644 arch/arm/dts/at91sam9g45-corvus.dts