arm: nitrogen6x: new memory setup from BD u-boot ...

This fixes various stability issues seen on new boards
with the old setup.

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

arm: mach-imx: add MMDC and CCM register defines for use in DCD ...

Makes .imxcfg files a lot more readable.

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

scripts: imx-image: add input validation to mw ...

Stop and print a helpful message if we encounter an
illegal token while parsing the DCD config, instead
of silently swallowing the error and pushing random
stuff into the DCD.

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

Makefile.lib: imxcfg: fix include path ...

MACH is not defined in this context, also it's very
unlikely that we will use the imximg tool with an other
arch than IMX, so just hardcode the path.

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

ARM: i.MX: tqma53: remove cpu_to_be32( from imx script ...

Remove leftovers from previous conversion from C code to imxcfg
script.

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

EFI: fix error handling in efi_get_boot() ...

efi_get_global_var() returns an error code, not NULL when it fails.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

readline: Fix history prev when history is empty ...

We cannot use list_entry() on an empty list. Without history
we have to return an empty line. This fixes a crash when the
cursor up button is pressed and no command has been entered
previously. Broken since:

commit ada160a
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date:   Tue Jul 29 11:54:26 2014 +0200

    readline: reimplement history functions

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reported-by: Teresa Gamez <t.gamez@phytec.de>

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>