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

Conflicts:
	arch/arm/boards/Makefile
	arch/arm/dts/Makefile

Merge branch 'for-next/imx'

Merge branch 'for-next/dts'

Merge branch 'for-next/doc'

Merge branch 'for-next/clps711x'

Merge branch 'for-next/arm-versatile'

Merge branch 'for-next/arm-errata' ...

Conflicts:
	arch/arm/boards/phytec-phyflex-imx6/lowlevel.c

Release v2014.07.0 ...

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

ARM: i.MX6 Phytec phyFLEX: Add watchdog reset workaround ...

phyFLEX boards beginning with 1362.2 have a workaround for this
i.MX6 bug:

ERR006282 ROM code uses nonreset PFDs to generate clocks, which may
lead to random boot failures

On these boards the SD4_DAT3 pin os connected to the CMIC. The CMIC
will reset the board after 10s when the pin isn't toggled.

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

splash.c: Add that .png files are suitable as splash images. ...

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Documentation: usb chapter of user manual ...

A number of minor fixes, and including the help output from the
"dfu-util" command for the benefit of the reader.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Documentation: Various tweaks to user manual, device tree chapter. ...

Grammar, typoes, font, link fixes.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Documentation: defaultenv chapter from user manual. ...

A number of grammar fixes, typoes, font changes from the defaultenv-2
chapter.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts/setupmbr: remove doxygen docs ...

This text is now in Documentation/boards/x86.rst.

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

mtd: delete partition erase size initialisation ...

Delete the partition erase size initialisation to let the code
that follows determine the biggest partition erase size.

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

Documentation: Numerous typoes/fixes in first few chapters of user manual. ...

Doc fixes such as:

 * font changes
 * spelling
 * punctuation
 * capitalization

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

automount: check for recursive automount ...

automount_mount calls run_command which may trigger an automount
again. This results in an endless loop. A simple way to trigger
this is:

mkdir /x; automount /x false; cd /x; something

Use a static variable to detect if we are currently in automount_mount()
and bail out if we are.

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

Documentation: User manual, "barebox" section ...

Various grammar/font fixes to that section, including adding an
additional section describing how to properly do "out of tree"
configuration and building.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Makefile: Add missing closing quote for "make help" ...

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Documentation: Fix glossary entry, "FTD" -> "FDT" ...

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Documentation: device tree bindings. ...

Adjusted Sphinx markup for devicetree bindings pages.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Documentation: Minor editing changes to filesystems content. ...

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Documentation: Clean up sandbox.rst, use definition list. ...

Some minor cleanup to the sandbox.rst documentation file, mostly
involving using a definition list for the options.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Documentation/boards/: Numerous grammar/typo/rendering fixes. ...

Various fixes related to fonts, rendering, grammar, etc., such as:

* spelling mistakes
* hyphenation
* capitalization for proper names
* proper bullet list formatting
* sentence structure

and so on.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Documentation: add mips boards files ...

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

menutree: let it select GLOB and GLOB_SORT ...

The menutree doesn't select CONFIG_GLOB, but it depends on it. Without
it will just hang. So let it select it automatically. Also remove the
dependency of CONFIG_GLOB on CONFIG_HUSH, because glob() will run with
the simple shell as well.

Also let CONFIG_MENUTREE select on CONFIG_GLOB_SORT. While is not
strictly needed, many people use menu/00-foo menu/10-bar menu/20-barf
to sort their menu entries. So select it out of convenience.

Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

arm: imx6: rename hummingboard directory to microsom ...

The rule in barebox is to name the directories after
the modules. As hummingboard is just one of the
carriers for the MicroSOM module, name the directory
accordingly.

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

arm: imx6: move imx6_init_lowlevel to single initcall ...

Instead of repeating the same lowlevel init for every board
move it to it's own initcall.

Avoids code bloat and shaves off almost 1.5kB of uncompressed
barebox size for a default imx_v7_defconfig build.

For boards wherethe hostname setup was done in  the postcore
initcall we move this to a device initcall to get it out of
the way.

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

imx6: add new chip revisions ...

Add new chip revisions for the new tap-out TO1.5 (i.MX6Q/D) and TO1.2
(i.MX6DL/S)

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

doc: link back from variables to device parameters ...

Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>