Release v2018.01.0 ...

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

commands/Kconfig: Fix tpyo ...

s/Pring/Print/

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

state: Documentation: Fix typo ...

underlaying -> underlying

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

state: Documentation: fix typo ...

Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Documentation: Bootchooser: fix typo ...

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

blspec: fix crash when trying to boot from loop mounts ...

When trying to boot from a loop mount path, the blspec code passes a
NULL pointer to dev_name, because cdev->dev is not set for loop mounts:

  unable to handle NULL pointer dereference at address 0x00000020
  pc : [<4fe09e28>]    lr : [<4fe02305>]
  sp : 4ffef7c0  ip : 31b75c78  fp : 31b6a388
  r10: 31b6a368  r9 : 315a4cac  r8 : 00000001
  r7 : 00000001  r6 : 311b8540  r5 : ffffffea  r4 : 31b6a3f8
  r3 : 00000000  r2 : 10000000  r1 : 00000001  r0 : 00000000
  Flags: nzcv  IRQs off  FIQs off  Mode SVC_32
  [<4fe09e28>] (dev_id+0xc/0x38) from [<4fe02305>] (blspec_scan_directory+0x3e1/0x484)
  [<4fe02305>] (blspec_scan_directory+0x3e1/0x484) from [<4fe02551>] (blspec_bootentry_provider+0x1d/0x3c)
  [<4fe02551>] (blspec_bootentry_provider+0x1d/0x3c) from [<4fe0984b>] (bootentry_create_from_name+0x23/0xdc)
  [<4fe0984b>] (bootentry_create_from_name+0x23/0xdc) from [<4fe246f9>] (do_boot+0x95/0x160)
  [<4fe246f9>] (do_boot+0x95/0x160) from [<4fe032e9>] (execute_command+0x21/0x48)
  [<4fe032e9>] (execute_command+0x21/0x48) from [<4fe088e3>] (run_list_real+0x56b/0x634)
  [<4fe088e3>] (run_list_real+0x56b/0x634) from [<4fe08249>] (parse_stream_outer+0xd9/0x164)
  [<4fe08249>] (parse_stream_outer+0xd9/0x164) from [<4fe08b6d>] (run_shell+0x31/0x60)
  [<4fe08b6d>] (run_shell+0x31/0x60) from [<4fe032e9>] (execute_command+0x21/0x48)
  [<4fe032e9>] (execute_command+0x21/0x48) from [<4fe088e3>] (run_list_real+0x56b/0x634)
  [<4fe088e3>] (run_list_real+0x56b/0x634) from [<4fe085fd>] (run_list_real+0x285/0x634)
  [<4fe444b9>] (unwind_backtrace+0x1/0x58) from [<4fe00b7d>] (panic+0x1d/0x34)
  [<4fe00b7d>] (panic+0x1d/0x34) from [<4fe42a75>] (do_exception+0xd/0x10)
  [<4fe42a75>] (do_exception+0xd/0x10) from [<4fe42ad5>] (do_data_abort+0x21/0x2c)
  [<4fe42ad5>] (do_data_abort+0x21/0x2c) from [<4fe42394>] (do_abort_6+0x48/0x54)

Fix this by checking cdev->dev as well as cdev before calling dev_name.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

FIT: Fix error path ...

In case of error of_unflatten_dtb() returns an ERR_PTR. Make sure
that handle->root contains NULL in this case so that we do not call
of_delete_node on the error pointer in the exit path.

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

net/e1000: fix driver probing in the presence of two e1000 devices ...

The .id member of the struct device for the invm device is not
initialized and so implicitly zero. This yields:

	register_device: already registered invm0

for the second i210 during probe.

So use the parent's id to initialize the id for invm, too, as is already
done for the corresponding e1000-nor device.

Fixes: a74b97f009c6 ("e1000: Expose i210's iNVM as a cdev")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

net: make struct bootp __packed to prevent unaligned store on MIPS ...

How to repropduce the unaligned store problem

    qemu-system-mips -nodefaults -M malta -m 256 \
                     -nographic -serial stdio -monitor null \
                     -bios barebox-flash-image \
                     -net user -net nic,model=rtl8139

    ...

    barebox:/ dhcp

    Ooops, address error on store!

    $ 0   : 00000000 00000000 01010600 697f2a2e
    $ 4   : a0850000 00000000 0000001c a040c1b8
    $ 8   : 00000000 00000002 00000002 00000000
    $12   : 00000000 00000040 00000100 00000001
    $16   : a040bba0 a0850000 a0850000 a0850000
    $20   : 00000000 00000075 00000076 a040ba20
    $24   : 00000002 a080f210
    $28   : 00000000 a03ffce0 fffffffd a0833b8c
    Hi    : 000154f8
    Lo    : 20000000
    epc   : a0833b84
    ra    : a0833b8c
    Status: 00000002
    Cause : 80000414
    Config: 80008482

    ### ERROR ### Please RESET the board ###

The unaligned store instruction is located in the bootp_request() from net/dhcp.c:

a0833b50 <bootp_request>:
..
a0833b7c:       3c020101        lui     v0,0x101
a0833b80:       24420600        addiu   v0,v0,1536 /* 0x1010600 -> v0 */
a0833b84:       0c20024a        jal     a0800928 <get_time_ns>
a0833b88:       ae02002a        sw      v0,42(s0) /* store 0x1010600 to addr s0 + 42 */

This assembler code is generated by mips-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0
from this:

    bp = (struct bootp *)payload;
    bp->bp_op = OP_BOOTREQUEST; /* 0x01 */
    bp->bp_htype = HWT_ETHER; /* 0x01 */
    bp->bp_hlen = HWL_ETHER; /* 0x06 */
    bp->bp_hops = 0;

Compiler replaces four 'store byte' instruction by one 'store 32-bit word'
instruction. Alas sometimes this leads to unaligned store situation.

Making struct bootp __packed prevents this optimization and fixes the problem.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Tested-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: boards: phytec-som-am335x: Revert unified MLO for 1GB ...

There is a problem in the data path between 1GB RAM devices and the
core, which leads to wrong read operations after DDR initialization
in soft resets. This needs more investigation, but until we didn't
found the problem, we will return to the origin MLO for 1GB RAM devices
with static RAM timings and without memory access.

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

Merge branch 'for-next/wd'

Merge branch 'for-next/net'

Merge branch 'for-next/misc'

Merge branch 'for-next/mips'

Merge branch 'for-next/mii'

Merge branch 'for-next/imx'

Merge branch 'for-next/i2c'

Merge branch 'for-next/e1000'

Merge branch 'for-next/dts'

Merge branch 'for-next/doc'

MIPS: add support for DPTechnics DPT-Module v1 ...

This product can be found here:
https://dptechnics.com/en/products/dpt-module-v1.html

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MIPS: ath79: ar9331: add ar9331_pbl_generic_start macro ...

Most of ar9331 boards have identical PBL. So we can sync the code
to single macro.

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MIPS: ath79: ar9331: add generic RAM macro ...

with this macro, we should be able to cover most of existing
ar9331 based boards.

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MIPS: ar9331: add watchdog support ...

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MIPS: dts: tl_wdr4300: enable watchdog node ...

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MIPS: dts: ar9344: add watchdog node ...

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

watchdog: add ar9344-wdt driver ...

This driver was developed and tested on QCA AR9344 WiSoC
but it may work on most known Atheros/QCA WiSoCs.

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MIPS: provide HAS_NO_BOARD_HL_CODE ...

some boards have PBL code, but no board specific
high level code.
Instead of creating dummy.c files, better provide
config to avoid compiling of board code.

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Bootm: remove uimage_close done later in bootm_boot ...

From 24e24f9 Mon Sep 17 00:00:00 2001
From: Clement Leger <clement.leger@kalray.eu>
Date: Thu, 14 Dec 2017 13:29:50 +0100
Subject: [PATCH] Bootm: fix double uimage_close

When uimage crc fails, the error handling path call uimage_close in
bootm_open_os_uimage and also in bootm_boot. This leads to crash/exception.
Keep the main error handling path in bootm_boot and remove uimage_close from
bootm_open_os_uimage to avoid double uimage_close.

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

spi: imx: make xchg_single timeout value compatible for older boards ...

A call of xchg_single will issue the transfer of 24 data bits with a given
maximum frequency. Since there exist some i.MX based boards with
spi-max-frequency = <100000>, change the xchg_single timeout to still
support those boards.

Fixes: 1439cdf7c6fc ("spi: imx: add timeout to xchg_single")
Signed-off-by: Alexander Kurz <akurz@blala.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>