Merge branch 'for-next/mxs'

Merge branch 'for-next/misc'

Merge branch 'for-next/imx-hab'

Merge branch 'for-next/imx-caam'

Merge branch 'for-next/imx'

Merge branch 'for-next/dts'

Merge branch 'for-next/dma-mask'

Merge branch 'for-next/dhcp'

Merge branch 'for-next/arm'

Merge branch 'for-next/am335x'

dts: update to v4.19-rc2 ...

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

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

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

Release v2018.09.0 ...

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

fs: tftp: Use pr_debug for errors ...

This has been debug output before for good reasons. The users will
usually print the error messages when they want to.

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

led: use max led value in case of led trigger ...

The led_poller function blink_func uses for flashing and blinking only the
values 1/0 for setting the leds. In case of an e.g. gpio led this is true. But
in case of pwm driven leds, where someone could dimm the leds, the value of 1
dimms the led. Use the max value for blinking and flashing of a led when enabling.

Signed-off-by: Oleg Karfich <oleg.karfich@wago.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

led: add pca955x led support ...

Signed-off-by: Oleg Karfich <oleg.karfich@wago.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: i.MX: make HAB certificate pathes explicitly overwritable ...

When building HAB images for i.MX we have to specify some pathes to
the certificates. This can be done with Kconfig variables. For better
build system integration we also want to be able to specify the pathes
in environment variables. This currently doesn't work as we specify
the variables from the environment with the -D option to cpp, but also
include generated/autoconf.h which overwrites the variables with the
values from Kconfig.

To overcome this introduce a Kconfig switch that explcitly selects
whether we want to have the variables from Kconfig or the environment.
Also, only pass the variables from the environment when explicitly
wanted.

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

arm: boards: phytec-som-am335x: Rename kernel image ...

Use zImage instead of linuximage for kernel.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts: imx-usb-loader: make i.MX6SoloX better to type ...

Now that users can select the device type on the command line, having a
name without whitespace makes input for that device type easier.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts: imx-usb-loader: allow use of unknown USB IDs ...

Some vendors fuse their devices so that the IMX USB ROM loader
identifies itself with a different Vendor and Product ID on USB
enumeration. Currently, imx-usb-loader will refuse to detect and work
with such devices, so let's teach it.

Because we cannot easily detect the device type from the USB ID in this
case, introduce the new command line parameter -d <type> to specify the
device type to use on the device path specified with -p <path>, even if
the VID/PID pair of that device is unknown. The device name is sourced
from the "name" field of the imx_ids array of known devices at the top
of the file. Using "-d list" will print a list of known device types.
Using -d without -p will not do anything useful, except generate a
warning.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts: imx-usb-loader: fail early if the USB device path does not match ...

find_imx_dev() loops through all USB devices, tries to open them, and
then compares the chosen device path (given with -p on the command line)
to the path of the currently opened device. The device path can be
checked earlier, opening the device is not neccessary.

We fail early here because in the next commit we want to enable the user
to force using a device by specifying its path. Opening every single
device available on the system then leads to unnecessary error messages
for all devices that do not match the provided path.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts: imx-usb-loader: rename imx_device() to imx_device_by_usb_id() ...

Make its purpose more clear when we introduce other similar functions
in one of the next commits.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Documentation: i.MX: update Kindle 4/5 board documentation ...

- complete the instructions to get into USB bootloader mode
- put hardware info to the top, and split into sections
- add info about the new defconfig
- remove build size hints, which have been applied to the defconfig
- transform literal blocks into code blocks

Signed-off-by: Roland Hieber <rohieb@rohieb.name>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: i.MX: add defconfig for the Kindle i.MX50 boards ...

Pin down the minimal config needed for a Kindle 4/5 device to boot into
the vendor Linux.

As the board documentation says, there is an upper limit of ~240 KB for
the bootloader partition on those devices. Using XZ image compression
instead of the default LZO reduced the file size from 214 KB to 172 KB,
so enabling that too.

Signed-off-by: Roland Hieber <rohieb@rohieb.name>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: i.MX: Kindle 4/5 is based on Device Tree, select it in Kconfig ...

Without OFTREE, no ./scripts/dtc and none of the device trees will be
built, and compilation will fail because the board code references it.

Signed-off-by: Roland Hieber <rohieb@rohieb.name>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

pinctrl: imx-iomux-v3: fix compiler warning ...

Fix a warning while compiling with GCC 5.4.0 (OSELAS.Toolchain 2016.02):

    drivers/pinctrl/imx-iomux-v3.c: In function 'imx_iomux_v3_set_state':
    drivers/pinctrl/imx-iomux-v3.c:153:13: warning: 'share_conf_val' may be used uninitialized in this function [-Wmaybe-uninitialized]
        conf_val &= ~IMX_PAD_SION;

we have the pattern:

	if (share_conf)
		share_conf_val = ...;
	...

	if (share_conf)
		use(share_conf_val);

GCC 5.4.0 doesn't recognize this so explicitly initialize
share_conf_val.

Signed-off-by: Roland Hieber <rohieb@rohieb.name>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

images: imx: Add targets for signed encrypted images ...

Add .esimximg and .esimximg.dek targets for signed and encrypted
images and their corresponding DEKs. Also add rule to generate final
.img.dek files.

As an example, adding encrypted images for imx6ull_evk would look like
this:

  FILE_barebox-nxp-imx6ull-evk-encrypted.img = start_nxp_imx6ull_evk.pblx.esimximg
  image-$(CONFIG_MACH_NXP_IMX6ULL_EVK) += barebox-nxp-imx6ull-evk-encrypted.img

  FILE_barebox-nxp-imx6ull-evk-encrypted.img.dek = start_nxp_imx6ull_evk.pblx.esimximg.dek
  image-$(CONFIG_MACH_NXP_IMX6ULL_EVK) += barebox-nxp-imx6ull-evk-encrypted.img.dek

Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts: imx: Support encrypted boot with HABv4 ...

.imxcfg configuration files support few more commands, all starting
with "hab_encrypt" string. That way it is possible to easily ignore
these commands, when image encryption was not requested. Hence, we can
use single .imxcfg file to generate signed and encrypted images in the
same build.

Images are encrypted in place by Freescale Code Signing Tool (cst),
using Data Encryption Key (DEK). This key needs to be encapsulated
by processor's hardware encryption engine to produce DEK blob, which
is unique for each device. DEK blob needs to be part of CSF area,
so we make enough space on the end of image to simply append it later,
e.g. during device flash procedure.

Introduced code was developed and tested on NXP i.MX6UL platform.

Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: imx: Update default image certificate for CST tool ...

CST tool by default generates certificate with
IMG1_1_sha256_4096_65537_v3_usr_crt.pem file name instead. Update
Kconfig default to match that.

Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts: imx: add optional argument to hab_blocks command ...

hab_blocks command is used to specify image authentication blocks for
HAB. Currently it was configured to authenticate full barebox
image. However in case of booting from SD card and adding MBR
partition table, HAB authentication fails, as final boot image is
modified.

Add an optional argument to hab_blocks command, to select between
3 types of authentication areas:
 - full: whole barebox image will be authenticated (this is default to
   keep compatibility),
 - from-dcdofs: image area up to dcdofs is not authenticated, so any
   changes up to dcdofs are possible,
 - skip-mbr: image area from 440 to 512 bytes is excluded from beeing
   authenticated, which allows to add / modify MBR partition table
   after building barebox image.

Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>