Merge branch 'for-next/multi-image'

ARM: i.MX27 pcm038: switch to multi image ...

This also converts the Phytec phyCORE i.MX27 aka pcm038 to use
image compression. The image will be named

barebox-phytec-phycore-imx27.img

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

ARM: i.MX: Add multi images support Makefile ...

This adds images/Makefile.imx which will contain the i.MX
specific image generation snippets.

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

Add multi images support ...

This adds the make infrastructure to build multiple SoC or
board specific images from a single barebox binary.

The basic idea is that we no longer have a single pbl, but instead
multiple pbls, one per image if necessary. Each pbl is defined
by its entry function so that each pbl can do exactly what a given
board needs. Additionally the pbls together with a self extracting
barebox binary can be encapsulated in specific image formats.

squashed in build fixes from Lucas Stach for make version >= 3.82:

Split Multimage Makefile rule in explicit and implicit parts

Fixes build with make version >=3.82

Frome the make 3.82 NEWS file:
* WARNING: Backward-incompatibility!
  In previous versions of make it was acceptable to list one or more explicit
  targets followed by one or more pattern targets in the same rule and it
  worked "as expected".  However, this was not documented as acceptable and if
  you listed any explicit targets AFTER the pattern targets, the entire rule
  would be mis-parsed.  This release removes this ability completely: make
  will generate an error message if you mix explicit and pattern targets in
  the same rule.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Lucas Stach <dev@lynxeye.de>

Merge branch 'for-next/mtd'

Merge branch 'for-next/misc'

Merge branch 'for-next/mips'

Merge branch 'for-next/mfd'

Merge branch 'for-next/menu'

Merge branch 'for-next/memtest'

Merge branch 'for-next/mci' ...

Conflicts:
	arch/arm/boards/ccxmx51/ccxmx51js.c
	arch/arm/boards/dmo-mx6-realq7/board.c

Merge branch 'for-next/kconfig-update'

Merge branch 'for-next/imx53-oftree' ...

Conflicts:
	arch/arm/dts/Makefile
	arch/arm/mach-imx/imx53.c

Merge branch 'for-next/imx-realq7' ...

Conflicts:
	arch/arm/dts/Makefile

Merge branch 'for-next/imx' ...

Conflicts:
	drivers/usb/imx/chipidea-imx.c

Merge branch 'for-next/debug'

Merge branch 'for-next/config-h'

Merge branch 'for-next/bootm'

Merge branch 'for-next/ata'

Release v2013.07.0 ...

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

clocksource: fix Marvell timer read-back value ...

Clocksource read callback expects incrementing timer values, while
internal timer on Marvell SoCs counts backwards. Fix value returned
by Marvell MVEBU and Orion clocksource drivers.

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

ARM: Marvell boards: Fix out of tree compilation ...

The Marvell boards accidently add a .c instead of a .o file
to the targets. This has the side effect of breaking out of tree
compilation.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

imx-image: fix path to imx-image binary ...

$(obj) doesn't necessarily contain the toplevel object path. Use
$(objtree) for this.

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

ARM: Add image end section ...

In the upcoming multi image build process we will cat images together.
To find the concatenated image we need to reliably find the end of the
current binary. This adds a dummy section at the end of a pbl binary.
Its only purpose is to mark the end of the image. The multi image
patches will add something to this section so that it doesn't get
discarded by the linker.

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

ARM: build dtbs depending on CONFIG_OFTREE ...

The upcoming multi image support will need devicetree binary
blobs even when there is no builtin dtb. Instead of depending
on CONFIG_BUILTIN_DTB depend on CONFIG_OFTREE and let this option
select DTC.

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

ARM: pbl: move linker script to lib ...

Since the pbl linker script can be reused by the upcoming multi image
build process move it to a common place. Also remove ENTRY() from the
linker script and instead add the -e option to the linker. This makes
the entrypoint configurable.

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

ARM: split barebox_arm_head in two separate functions ...

This adds a new function __barebox_arm_head() which defines an
the regular barebox ARM header, but which jumps to the end of
the function so that this can be embedded into another function.
barebox_arm_head() now just uses it and jumps to barebox_arm_reset_vector
just like it did before.

This makes it possible to define board specific entry points.

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

ARM: dts: Add .S files as secondary target ...

Oherwise they get removed during build and trigger a rebuild of
the image.

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

ARM: Allow to pass a devicetree via boarddata ...

Addionally to having a builtin DTB provide the possibility for
the board to provide a dtb via boarddata.

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

ARM: i.MX51 babbage: detect environment device ...

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