ARM Samsung: fix booting from NAND without pbl ...

This was broken in 558d72dc5116 (ARM Samsung: fix booting from NAND with
pbl). '_text' is TEXT_BASE when building without pbl and (TEXT_BASE -
SZ_2M) when building with pbl, so this works in both cases.

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

Conflicts:
	arch/arm/mach-samsung/lowlevel-s3c24x0.S

ARM: am335x bone: Fix Booting from eMMC ...

Booting a beaglebone black from eMMC is broken since:

commit 0d6392d
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date:   Thu Jun 5 12:09:07 2014 +0200

    ARM: AM335x: Beaglebone: Use stripped down devicetree for MLO

The stripped down device tree does not have the eMMC device node which
the beaglebone black needs for booting. Add this node to the common dts
file, but keep it disabled. It gets enabled later with a call to
am33xx_of_register_bootdevice() when the system is booted from eMMC.

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

command: memset: Fix argument order in help text ...

memset takes ADDR DATA COUNT just like the C function, not
ADDR COUNT DATA.

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

arm: imx53-qsrb: fix initcalls on START-R board ...

The compatible changed when we switched to the upstream
DTs, so the initcalls would not be executed on the START-R
board.

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

net: Call edev->recv with correct eth_device ...

edev->recv has to be called with edev as argument, not eth_current.
This fixes networking when multiple network devices are used and the
current one is switched during runtime.

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

of_partition: devfs_add_partition returns an error pointer ...

Check for the return value of devfs_add_partition with IS_ERR.
Otherwise we dereference a NULL pointer when devfs_add_partition
fails.

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

arch/arm/lib/bootm: fix length check of kernel image ...

Signed-off-by: Sebastian Block <basti@linux-source.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: i.MX: esdctl: i.MX53 has esdctl v4, not v3 ...

On the i.MX53 this has the effect that in early init only
half of the memory bank is detected and the barebox image
is place in the middle of SDRAM.

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

drivers/mtd: fix NULL pointer dereference in partition lock/unlock ...

Some mtd device does not support lock and unlock functions. Adding this check
avoids crashing when mtd_part_lock/unlock are called for such devices.

Signed-off-by: Zahari Doychev <zahari.doychev@linux.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

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>

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>

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>

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>

imx6:phyFLEX: Fix ENTRY_FUNCTION ...

For some phyFLEX-i.MX6 modules the call __barebox_arm_head() was not removed.
With this function the barebox does not start.

Signed-off-by: Christian Hemp <christian.hemp@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

commands: include missing header ...

When compiled for ARCH=sandbox, we get a compiler warning
if we don't include the needed header file as well.

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

kernel-install: fix return value check for getline ...

getline returns the number of characters read, so check for
ret < 0 instead of ret.

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

ifup: Add comment why xxx-discover files have to be skipped ...

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

ARM: i.MX efika-sb: switch otg port to utmi mode ...

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

ARM: imx_v7_defconfig: update ...

Enable blspec and menutree support which was lost.

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

net: ifup: skip *-discover files for ifup -a ...

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

boot: Fix boot -m ...

We have to continue when bootentries_collect succeeds, not when it fails.

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

commands: gpio_direction_output: add missed VALUE parameter to help message ...

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

ARM: AM335x: Beaglebone: Fix memory setup for Beaglebone black ...

Commit 0d6392d introduced a stripped
down device tree used for both white and black Beaglebone variants
that included the 256 MiB memory node from am335x-bone-common.dtsi.
This leads to the following error in the MLO:

    mmu: Critical Error: Can't request SDRAM region for ttb at 9fff4000

This patch removes the (for the Beaglebone black) invalid memory size
from the common device tree and instead registers the memory bank
manually in the board file.

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

mtd: use long long dev param for size ...

Signed-off-by: Herve Codina <Herve.CODINA@celad.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

param: Add support for long long read only dev param ...

Signed-off-by: Herve Codina <Herve.CODINA@celad.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: Phytec-phyCARD-imx27: Add missing compatible check ...

Only run pca100 code when it's actually a pca100. While at it
consolidate two initcalls.

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

Merge branch 'pu/mii-tool'

mips: Fix dtb build rules ...

Add intermediate .S files to .SECONDARY. Otherwise make deletes them
and regenerates them each build.
Also remove KBUILD_DTBS since the make system descends in dts/ anyway.

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

mii-tool: Fix gigabit advertise / link partner ability mixup ...

bmcr2 contains the gigabit advertise bits and lpa2 contains the gigabit
link partner ability bits, not the other way round.

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