Merge branch 'for-next/arm'

Revert "nv: Do not create globalvars from nvvars" ...

This reverts commit 35d8e85.

Revert "globalvar: remove code for unqualified globalvars" ...

This reverts commit e4f8105.

Revert "globalvar: make globalvar functions more consistent" ...

This reverts commit 1b4a05c.

Revert "param: remove unnecessary device_d * argument" ...

This reverts commit 0071bac.

Revert "globalvar: don't use nv_device if CONFIG_NVVAR is disabled" ...

This reverts commit b378e8c.

Revert "globalvar: make nv_device static" ...

This reverts commit f655902.

Revert "nv: Fix setting of nv.dev.<devname>.<param> variables" ...

This reverts commit eaf884b.

Revert "globalvar: Fix value of new globalvar when nvvar exists" ...

This reverts commit f8a1774.

Release v2017.06.0 ...

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

watchdog: i.MX: fix i.MX6 reset ...

According to the Errata ERR004346 (WDOG: WDOG SRS bit requires to be written
twice), add another two writes to ensure there must be at least two
writes happen in the same one 32kHz clock period.
Without this two additional writes, the system will not reset always.

Tested with i.MX6Quad and i.MX6 UltraLite

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

ARM: mvebu: fix size mask for RAM window ...

The size field in the window control register occupies bits 31:16. So
adapt ARMADA_370_XP_DDR_SIZE_MASK accordingly. This fixes detection of
RAM chips smaller than 32 MiB and so probably doesn't affect any
supported machine.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ratp: only allow bidirectional consoles ...

Ignore requests to switch to RATP mode in input-only or output-only
consoles.

This actually also avoids segfaulting later on:

    #0  0x0000000000000000 in ?? ()
    #1  0x000000000040b2a4 in console_send (r=<optimized out>, pkt=0x7fffffffd8ec, len=4) at common/ratp.c:102
    #2  0x000000000042ab99 in ratp_behaviour_a (pkt=0x7ffff7298780, ri=0x7ffff72766d0) at lib/ratp.c:530
    #3  ratp_state_machine (pkt=0x7ffff7298780, ri=0x7ffff72766d0) at lib/ratp.c:1384
    #4  ratp_poll (ratp=0x7ffff7277ed8) at lib/ratp.c:1561
    #5  0x000000000042b2ab in ratp_establish (ratp=ratp@entry=0x7ffff7277ed8, active=active@entry=false, timeout_ms=timeout_ms@entry=100) at lib/ratp.c:1645
    #6  0x000000000040b888 in barebox_ratp (cdev=cdev@entry=0x7ffff7212bd0) at common/ratp.c:470
    #7  0x00000000004046c3 in getc_raw () at common/console.c:416
    ...

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ratp: avoid using already freed memory ...

If ratp_establish() fails we would be accessing the ratp_internal
struct after having disposed it.

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

sandbox: Fix registering file/fifo consoles ...

barebox_register_console() uses xzalloc which requires the malloc pool
to be initialized, so call it during the second option parsing when
this is already done.

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

sandbox: fix registering multiple consoles ...

Consoles need to be registered with the "console" device name so that
they are probed by the correct driver. The barebox_register_console()
was already forcing this as it was overwriting the name that was being
passed as argument, but it was failing to provide a unique id for
each new console, so the underlying register_device() would just
return an error when wanting to re-register a device with device name
"console" and id 0.

We remove the unused name parameter from barebox_register_console() as
it is really nowhere used, and also specify DEVICE_ID_DYNAMIC as id,
so that a new unique device id is given to each newly registered
console device.

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Documentation: remote-control: fix typo ...

Correctly reference `--port` instead of	`--baudrate` when explaining
how to specify the port.

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Makefile: Speed up evaluation of ld options ...

Since "333ff7b1e4 Fix linking with new ld, based on u-boot" the build
with multiple images became unreasonable slow. This is because the
ld-option macro was evaluated once for each image. Fix this by exporting
and using LDFLAGS_barebox from the main Makefile.

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

usb: imx: Only use clock when it exists ...

Fixes: bbe0df9

I assumed all chipidea devices actually have a clock. This is true
when looking at the device tree, but in barebox not all i.MX SoCs
use the clocks provided by the device tree. Most instead use
clkdev_add_physbase() to attach a clocks to devices. For these the
chipidea device does not have a clock.

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

xfuncs: fix format specifier in pr_emerg call ...

`enomem_panic()` calls `pr_emerg()` using `%d` in the format specifier
string to print a value of type `size_t`.  Change it to `%zu`.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

video: select OFTREE from DRIVER_VIDEO_IMX_IPUV3 ...

DRIVER_VIDEO_IMX_IPUV3 selects VIDEO_VPL, which has a hard dependency
on OFTREE, so it is required to select this one, too.

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

docs: render DIP switches as verbatim text ...

Render images of DIP switches as <pre> html tags/verbatim text. This
fixes the sphinx errors:

    Documentation/boards/imx/Element14-WaRP7.rst:25: ERROR: Malformed table.
    Documentation/boards/imx/Element14-WaRP7.rst:36: ERROR: Malformed table.
    Documentation/boards/imx/Element14-WaRP7.rst:47: ERROR: Malformed table.

Signed-off-by: Stefan Lengfeld <contact@stefanchrist.eu>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

docs: add file suffix rst for inclusion in sphinx documentation ...

Signed-off-by: Stefan Lengfeld <contact@stefanchrist.eu>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

docs: fix hiding of chapter from imx.rst ...

The files 'mxs.rst' and 'imx.rst' used the same chapter headline:

    Freescale i.MXs

This confuses sphinx. It does not support having the same headline at
the same level twice and hides the other chapter. Just rename the
chapter heading to avoid that.

And rename the subchapter headline to 'MXS boards' for clarity.

Signed-off-by: Stefan Lengfeld <contact@stefanchrist.eu>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

imx-usb-loader: add prefix '0x' for hex value ...

Signed-off-by: Stefan Lengfeld <contact@stefanchrist.eu>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

images: clean *.imx-sram-img files ...

The command

    make ARCH=arm clean

should also clean the *.imx-sram-img files.

Signed-off-by: Stefan Lengfeld <contact@stefanchrist.eu>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

arm: mach-omap: Change mountpoint of boot partitions ...

If using EMMC and SD as bootsources, mounting the boot partition of both
devices to /boot makes trouble. Either the correct device is mounted to
/boot or a remount of /boot has to be performed.

To ensure this problem each MMCn bootsource will be mounted to his own
path in /mnt/mmcN.0

Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: Embedsky E9: Update environment ...

Signed-off-by: Andrey Panov <rockford@yandex.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Fix linking with new ld, based on u-boot ...

U-boot commit info:
http://git.denx.de/?p=u-boot.git;a=commit;h=e391b1e

Signed-off-by: Andrey Panov <rockford@yandex.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mtd: only build mtdraw_raw_to_mtd_offset when write support is enabled ...

mtdraw_raw_to_mtd_offset() is only used from mtdraw_erase(), so will
only be referenced when MTD write support is enabled. This fixes a
harmless warning.

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