Merge branch 'for-next/blspec'

Merge branch 'for-next/state'

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

Conflicts:
	drivers/mtd/core.c

Merge branch 'for-next/doc'

state: add support for fixed length strings ...

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ubi: Update documentation ...

The previous patches changed the UBI naming and made automounting
UBIFS easier. Update the documentation accordingly.

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

Documentation: be more precise about the topic ...

'system restart' is the correct topic here.

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

Documentation: fix spelling ...

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

Documentation: imx: Fix underline length ...

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

blspec: Automatically append rootarg ...

This patch makes it possible to automatically add a suitable root= option
for booting Linux from the same filesystem on which the bootspec entry
has been found. This adds an additional 'linux-appendroot' option to
bootspec which if set to 'true' will cause barebox to automatically
add a root= option. This currently works for NFS, UBIFS and regular
block devices like ATA, SD/MMC using the root=PARTUUID= mechanism.

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

fs: nfs: Implement Linux rootarg ...

Add the root= parameter for NFS filesystems. We currently hardcode
v3 and tcp which probably needs to become configurable at some point.

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

Documentation: add some info about the reset variants ...

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

Documentation: add some info about the reset reason framework ...

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

state: Documentation: fix dts code example ...

It's "uint32" not "u32" and we use integers for the "enum32" defaults.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

state: Documentation: the backend properties are not optional (anymore) ...

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

state: Documentation: add newly implemented "uint8" types. ...

Cc: Jan Luebbe <jluebbe@debian.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Documentation: fix typo ...

This change enables Sphinx to resolve the reference.

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

Merge branch 'for-next/state'

Merge branch 'for-next/spi-nor'

Merge branch 'for-next/misc'

Merge branch 'for-next/imx'

ARM: socfpga: xload: support qspi bootsource ...

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

Documentation: blspec: Document blspec over NFS ...

We support booting blspec entries found on NFS servers, add documentation
for it.

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

Documentation: blspec: Fix typo ...

The device index is missing in the example, add it.

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

Documentation: booting linux: improve doc text ...

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

state: documentation: add anchor so that state can be referenced later ...

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

i.MX: Add provisions to boot from IRAM ...

This commit add a very basic code to allow Barebox to be booted from
IRAM. Given that the amount of IRAM on most i.MX variants is
insufficient to contain a copy of Barebox with any reasonable degree
of functionality this code uses IRAM only as a temporary location and
eventually bootstraps from DRAM. But the presense of the intermediate
IRAM-only stage allows to add provisions to test the area of DRAM that
Barebox would be using to facilitate various testing scenarious.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Documentation: mips: fix tplink-mr3020 instruction ...

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

Merge branch 'for-next/state'

Documentation: rename powerpc manual to .rst ...

Fixes:
Documentation/boards/powerpc.rst:6: WARNING: toctree glob pattern u'boards/powerpc/*' didn't match any documents

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>