Merge branch 'for-next/ratp'

Merge branch 'for-next/net'

Merge branch 'for-next/misc'

Merge branch 'for-next/linux-headers'

Merge branch 'for-next/input'

Merge branch 'for-next/hab'

Merge branch 'for-next/fit'

Merge branch 'for-next/dts'

Merge branch 'for-next/arm'

Release v2016.02.0 ...

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

spi-nor: Port erase timeout fix from Linux ...

Large SPI-NOR (>2MB) chips reuire more than 40 seconds to perform
all-chip erase. This patch adapts
09b6a37 from Linux kernel, which
implements simple heuristics in order to calculate appropriate wait
time (see orignal commit's description for more details of the fix)

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

nfs: forward filesystem options to the kernel command line ...

Using NFS in conjunction with boot spec and the feature to let Barebox
auto generate a kernel command line must keep the options the NFS filesystem
was mounted in Barebox. This patch extends the kernel command line parameter
on demand if something different than the defaults are used.

The command:

barebox:/ boot nfs://myhost//root

expands to the kernel command line:

nfsroot=myhost:/root,v3,tcp

while the command:

barebox:/ boot nfs://myhost:2049//root

expands now to the kernel command line:

nfsroot=myhost:/root,v3,tcp,mountport=2049,port=2049

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

i.MX habv4: Fix RVT address for newer SoCs ...

Newer i.MX SoCs have the RVT at 0x98, not at 0x94 any more.

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

imx: hab: Make hab status functions SoC specific ...

The HABv4 functions need access a part of the ROM which is
located in the zero page. This must be done early, before the
MMU has been configured and the zero page has been set to faulting.
The HAB functions currently use cpu_is_imxxy(). At the stage where
HAB is called the i.MX CPU type variable is not yet initialized,
so this code only works when only one i.MX type is enabled and
cpu_is_imxxy() are compile time constants.

To fix HAB support when more than one i.MX type is enabled make the
HAB status function SoC specific so that we can drop the use of
cpu_is_imxxy().

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

scripts: imx-usb-loader: Do not zero out boot_data_ptr ...

This shouldn't be necessary. So far it didn't hurt either, but now
this invalidates the signature of the image, so keep the image
unmodified.

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

images: imx: Add targets for signed images and signed usb images ...

Add .simximg target for signed images and .usimximg for signed
images suitable for USB upload

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

Make: i.MX: Allow to pass config file to cmd_imx_image ...

Pass the config file to cmd_imx_image as arguments to make it more
flexible. Also add the possibility for another arg containing additional
options.

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

ubifs: Fix reading holes in files ...

When a whole block of 4KiB in an ubifs file is zero then the block is
not stored in the filesystem. read_block() returns -ENOENT in this case,
so this return value must be treated as success.

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

docs: fix typos ...

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

ARM: i.MX25: fixup broken DryIce GPR ...

Fixup the DryIce Non-Non-Volatile-Memory GPR register.

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

dts: update to v4.5-rc1 ...

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

dts: update to v4.4 ...

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

dts: update to v4.4-rc8 ...

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

dts: update to v4.4-rc7 ...

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

dts: update to v4.4-rc6 ...

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

dts: update to v4.4-rc5 ...

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

ARM: i.MX53: CCXMX53: Move device tree out of dts/ ...

The dts files accidently have been added to dts/. Move them to a proper
place.

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

scripts: imx-image: Allow to create HAB signed images suitable for USB upload ...

For USB upload we must execute the DCD table manually and
invalidate the DCD table in the uploaded image afterwards
to prevent the ROM from executing the DCD data again. Doing this
changes the image and thus also invalidates the signature. To
make HAB signed images suitable for USB upload possible we add an
option to create HAB signed images suitable for USB upload. With
this option the image is created like this:

- The image is created like usual, but with already invalidated DCD
  data (DCD length is set to zero)
- This image is then signed using the CST
- After this the DCD data is made valid (Set DCD length to the real
  length)

imx-usb-loader now finds valid DCD data, executes it and by invalidating
the DCD data it restores the state the image had during signing.

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

scripts: imx-image: Factor out a read_file function ...

The same code will be used a second time in a followup patch, so
factor out a common function.

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

scripts: imx-usb-loader: Use dcd len to invalidate dcd data ...

We invalidate the dcd data in the uploaded image since we already
processed it manually. To do so we have set the dcd pointer to 0.
Doing it this way prevents the ROM from executing the HAB code in
debug mode. Use the dcd length instead to invalidate the dcd data.

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