Merge branch 'for-next/resource-err-ptr'

Merge branch 'for-next/phycore-imx6'

Merge branch 'for-next/openrisc'

Merge branch 'for-next/omap'

Merge branch 'for-next/musb'

Merge branch 'for-next/misc'

Merge branch 'for-next/mips'

Merge branch 'for-next/marvell'

Merge branch 'for-next/imx'

Merge branch 'for-next/firmware'

Merge branch 'for-next/at91'

Merge branch 'for-next/arm'

ARM: defconfig: remove board specific mvebu defconfigs ...

The boards are now covered by mvebu_defconfig

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: Add mvebu_defconfig ...

This adds a mvebu_defconfig which enables all mvebu based boards.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

ARM: am335x: NAND MLO update: always let the user confirm updating ...

Before actually doing something the user should always confirm the
update. Move the question out of the if() block.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: am335x Phytec phyCORE: register SPI NOR and NAND update handlers ...

Additionally to the MLO update handlers also register the update
handlers for the regular barebox image.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: am335x: Add a NAND update handler for the regular barebox ...

To be able to not only update the MLO in NAND but also the
regular barebox image.
Since this is implemented with help of the corresponding xload
handler this also removes the 'xload' from the Kconfig options
and the filename.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: am33xx update SPI NOR: Ask use before flashing ...

Let the user confirm the update process before flashing the new
image.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: am33xx update SPI NOR: Check image size before flashing ...

Test if the image fits into the partition before flashing it. Makes
the update process more safe.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: am335x_defconfig: Enable USB support ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: dts: Update am335x-bone-common.dtsi ...

Update from current upstream dtsi. This enables the USB control
module.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: AM33xx: Enable USB and USB phy clocks ...

These are necessary for USB support. To make sure they are actually
enabled when a USB capable barebox is started call the clock enable
function during startup also for the full barebox, not only the MLO.

Signed-off-by: Rolf Evers-Fischer <rolf.evers.fischer@delphi.com>

ARM: AM33xx: Add AFI GF board support ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: AM33xx SPI MLO update handler: detect non CH images ...

The AM3xxx can boot images containing a Configuration Header
(generated with omap_signGP) or images with GP Header (simple
size/address information in front of raw image). Update the
SPI NOR barebox update handler to detect the GP Header images.
These have 0x65726162 ('bare') at the offset header[10]. Also
automatically swap the endianess for non swapped images so
that the regular non swapped images can also be flashed.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts: mk-am3xxx-spi-image: fix wrong assumptions about SPI images ...

We assumed that there is a special image format for SPI. This is not
the case. The AM33xx can boot either images generated with omap_signGP
or raw images which only have the image size and load address in front
of the image. Whether these images are booted from SPI or another
boot medium doesn't matter. The only special thing about SPI is that
the image is in big endian format.

- renames mk-am3xxx-spi-image.c to mk-omap-image.c as the image format
  is not only supported by AM3xxx but also by the OMAP SoCs
- removes the option to specify the SoC
- introduces -s to build a big endian image
- detects if an image already is an image generated with omap_signGP

So the behaviour is like this:

raw image -> mk-omap-image -> prepend size/address -> image for SD/MMC
raw image -> mk-omap-image -s -> prepend size/address, big endian swap -> image for SPI
CH image -> mk-omap-image -> nothing, input == output
CH image -> mk-omap-image -s -> big endian swap -> image for SPI

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

imx35-regs: add UART2 to CCM defines ...

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: at91: add sama5d4ek board support ...

Add Atmel sama5d4ek board support, which include following features:
  - NAND flash support
  - SPI flash support
  - MMC card support (MCI1)
  - LCD display support (with QT1070)
  - Ethernet support

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: at91: add sama5d4 soc support #2 ...

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: at91: add sama5d4 soc support #1 ...

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: mvebu: Allow multiple SoCs ...

Now that the correct SoC specific memory fixup function is called
we can allow to select multiple SoCs in Kconfig.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>