Merge branch 'for-next/usb-host' ...

Conflicts:
	drivers/usb/core/Makefile

Merge branch 'for-next/usb-gadget' ...

Conflicts:
	commands/Makefile
	common/Kconfig
	common/Makefile
	drivers/usb/gadget/dfu.c

Merge branch 'for-next/usb'

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

Conflicts:
	arch/mips/dts/jz4755.dtsi
	commands/Makefile

Merge branch 'for-next/ppc'

Merge branch 'for-next/net'

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

Conflicts:
	lib/Makefile

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

Conflicts:
	arch/arm/dts/Makefile
	common/Makefile
	lib/Makefile

Merge branch 'for-next/marvell'

Merge branch 'for-next/led'

Merge branch 'for-next/imx'

Merge branch 'for-next/i2c'

Merge branch 'for-next/env'

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

Conflicts:
	.gitignore
	Makefile
	drivers/serial/Makefile

Merge branch 'for-next/dts'

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

Conflicts:
	Makefile

Merge branch 'for-next/console'

Merge branch 'for-next/canon'

Merge branch 'for-next/arm'

Merge branch 'for-next/am335x'

MIPS: qemu-malta_defconfig: enable metadata in barebox image (IMD) ...

Usage:

  $ qemu-system-mips -nodefaults -nographic -M malta -m 256 \
        -serial stdio -monitor null \
        -bios ./barebox-flash-image

  ...

  barebox:/ imd /dev/nor0
  release: 2014.07.0-00401-gd863821
  build: #148 Sat Aug 2 09:22:16 MSK 2014

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MIPS: add support for metadata in barebox images ...

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Add support for metadata in barebox images ...

It's often useful to get some information about a barebox image
before starting or flashing it. This patch introduces barebox
Image MetaData (IMD). When enabled a barebox image will contain
a list of tags containing the desired information. We have tags
for:

- the barebox release (2014.07.0-00160-g035de50-dirty)
- the build timestamp (#741 Mon Jul 28 15:08:54 CEST 2014)
- the board model the image is intended for
- the device tree toplevel compatible property

Also there is an additional generic key-value store which stores
parameters for which no dedicated tag exists. In this patch it
is used for the memory size an image supports.

Since there is no fixed offset in a barebox image which can be
used for storing the information, the metadata is stored somewhere
in the image and found by iterating over the image. This works
for most image types, but obviously not for SoC images which are
encoded or encrypted in some way.

There is a 'imd' tool compiled from the same sources for barebox,
for the compile host and for the target, so the metadata information
is available whereever needed.

For device tree boards the model and of_compatible tags are automatically
generated.

Example output of the imd tool for a Phytec phyFLEX image:

build: #889 Wed Jul 30 16:08:54 CEST 2014
release: 2014.07.0-00167-g6b2070d-dirty
parameter: memsize=1024
of_compatible: phytec,imx6x-pbab01 phytec,imx6dl-pfla02 fsl,imx6dl
model: Phytec phyFLEX-i.MX6 Duallite Carrier-Board

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

make: Use shell script to generate .dtb.S files ...

Using shell in make to generate an assembly file is not very
readable and extendable. Add an external shell script instead.

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

dtc: compile fdtget ...

We need fdtget in subsequent patches, so compile it.
Unfortunately this is not straight forward. fdtget needs libfdt,
but the Kernel Build System is not prepared for compiling
libraries for the host or binaries from files in multiple directories.
This patch moves the libfdt files to the dtc toplevel directory and
compiles fdtget as a binary from multiple source files but from
the same directory.

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

make: build device trees with obj-dtb-y and pbl-dtb-y ...

To build an object file from a device tree currently we currently
have to add them to the Makefile twice, once to dtb-y and once to
obj-y. This patch introduces obj-dtb-y and pbl-dtb-y to directly
compile a device tree object file for inclusion in the barebox binary
or the pbl respectively.
The now unneeded dtb-y targets are removed.

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

read_file: introduce read_file_2 ...

read_file has some limitations:

- It is not possible to check the error code since read_file returns
  NULL for failure
- It is not possible to limit the buffer size to sensible limits.

This patch introduces read_file_2 which doesn't have these limitations.
read_file becomes a wrapper around read_file_2.

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

move file helper functions to separate file ...

We have our file helper functions in several places. Move them
all to lib/libfile.c.
With this we no longer have file helpers in fs/fs.c which contains
the core fs functions and no functions in lib/libbb.c which are
not from busybox.

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

dts: update to v3.16 ...

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

Revert "common: resource: print conflicts as warning" ...

On several i.MX boards we register SDRAM with the values
from the SDRAM controller and also with values from the
device tree. This now issues a warning each time the board
is started. Revert the commit for now.

A better solution might be to check if the same SDRAM region
already exists before trying to register it again.

This reverts commit c9e2e08.

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