Merge branch 'for-next/misc'

Merge branch 'for-next/macos'

Merge branch 'for-next/imx'

Merge branch 'for-next/dts'

Merge branch 'for-next/dma'

Merge branch 'for-next/checkpatch'

Merge branch 'for-next/at91'

Merge branch 'for-next/arm'

Release v2019.06.0 ...

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

ARM: imx6sx-sdb: remove PHY reset GPIO from DT ...

The board file already has a more sophisticated PHY reset sequence,
so there is no need to do it in the driver.

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

nvmem: ocotp: Change TIMING calculation algorithm ...

Port of patch from linux-arm-kernel:
| From: Bryan O'Donoghue <pure.logic@nexus-software.ie>
|
| nvmem: imx-ocotp: Change TIMING calculation to u-boot algorithm
|
| The RELAX field of the OCOTP block is turning out as a zero on i.MX8MM.
| This messes up the subsequent re-load of the fuse shadow registers.
|
| After some discussion with people @ NXP its clear we have missed a trick
| here in Linux.
|
| The OCOTP fuse programming time has a physical minimum 'burn time' that is
| not related to the ipg_clk.
|
| We need to define the RELAX, STROBE_READ and STROBE_PROG fields in terms of
| desired timings to allow for the burn-in to safely complete. Right now only
| the RELAX field is calculated in terms of an absolute time and we are
| ending up with a value of zero.
|
| This patch inherits the u-boot timings for the OCOTP_TIMING calculation on
| the i.MX6 and i.MX8. Those timings are known to work and critically specify
| values such as STROBE_PROG as a minimum timing.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

nvmem: ocotp: Ensure WAIT bits are preserved ...

Port of patch from linux-arm-kernel:
| From Bryan O'Donoghue <pure.logic@nexus-software.ie>
|
| nvmem: imx-ocotp: Ensure WAIT bits are preserved when setting timing
|
| The i.MX6 and i.MX8 both have a bit-field spanning bits 27:22 called the
| WAIT field.
|
| The WAIT field according to the documentation for both parts "specifies
| time interval between auto read and write access in one time program. It is
| given in number of ipg_clk periods."
|
| This patch ensures that the relevant field is read and written back to the
| timing register.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

nvmem: ocotp: Elongate OCOTP_CTRL_ADDR field ...

Port of patch from linux-arm-kernel:
| From: Bryan O'Donoghue <pure.logic@nexus-software.ie>
|
| nvmem: imx-ocotp: Elongate OCOTP_CTRL ADDR field to eight bits
|
| i.MX6 defines OCOTP_CTRLn:ADDR as seven bit address-field with a one bit
| RSVD0 field, i.MX7 defines OCOTP_CTRLn:ADDR as a four bit address-field
| with a four bit RSVD0 field.
|
| i.MX8 defines the OCOTP_CTRLn:ADDR bit-field as a full range eight bits.
|
| i.MX6 and i.MX7 should return zero for their respective RSVD0 bits and
| ignore a write-back of zero where i.MX8 will make use of the full range.
|
| This patch expands the bit-field definition for all users to eight bits,
| which is safe due to RSVD0 being a no-op for the i.MX6 and i.MX7.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

dts: update to v5.2-rc3 ...

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

dts: update to v5.2-rc2 ...

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

dts: update to v5.2-rc1 ...

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

remove CONFIG_DEBUG_INFO ...

The ELF file should have debug symbols, the binary should have no symbols any way.

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

ARM: udoo-neo: add ocotp and environment nodes ...

Add the ocotp node to retrieve the MAC address from the fuses and enable
environment storage on the SD-card.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mvebu: make the compiler inline mvebu_remap_registers ...

Without that gcc 7.3.1 (from OSELAS.Toolchain-2018.02.0) makes
mvebu_remap_registers a standalone function which in its prolog saves
two registers to the stack. However this function is called early during
startup when there is no stack available yet and sp still points into
the nirvana which makes barebox crash.

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

firmware: add gitignore file for *.bin ...

There is no intention to commit static firmware to this directory.
If there is a use case, gitignore can be overridden explicitly.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

images: ignore *.csfbin files ...

The csfbin files are created during a HABV4 build, ignore them since they
are automatically generated.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts: imx-usb-loader: add i.MX8MQ PID and VID ...

Add new PID and VID for i.MX8:
Bus 001 Device 057: ID 1fc9:012b NXP Semiconductors i.MX 8M Dual/8M QuadLite/8M Quad Serial Downloader

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

serial_ns16550: readd support for mvebu armada 38x ...

The armada 38x device tree traditionally used "snps,dw-apb-uart" as
compatible for the internal UARTs. This was changed in Linux by commit
b7639b0b15dd ("serial: 8250_dw: Limit dw8250_tx_wait_empty quirk to
armada-38x devices") which was imported into barebox in e4067b75fb6c
("dts: update to v4.18-rc1") to "marvell,armada-38x-uart".

Teach the driver about the new compatible to make the console work
again.

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

plathome-openblocks-a6: provide a kwbimage.cfg file ...

Since support for Openblocks A6 was introduced in 2014 and commit
906afb533186 ("ARM: mvebu: Add Plat'home's Kirkwood Openblocks A6 board
support") there is no kwbimage config. This patch guesses such a file
that at least makes barebox compile again with
CONFIG_MACH_PLATHOME_OPENBLOCKS_A6=y.

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

ARM: Initial OP-TEE support ...

This adds initial support for OP-TEE, see https://www.op-tee.org/

barebox starts in secure mode as usual. When booting a kernel
the bootm code also loads the optee_os binary. Instead of jumping
into the kernel barebox jumps into the optee_os binary and puts
the kernel execution address into the lr register. OP-TEE then
jumps into the kernel in nonsecure mode.

The optee_os binary is passed with the -t option to bootm or
with global.bootm.tee.

Optionally OP-TEE can be compiled into barebox using the builtin firmware
feature. Enable the Kconfig option and place or link your tee binary as
optee.bin into the firmware directory.

The amount of SDRAM which is kept free for OP-TEE is configurable.

This patch was tested on a i.MX6 Nitrogen6x board.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

filetype: fix typo ...

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

doc: boards: imx: add HAB section ...

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

doc: boards: imx: document image creation ...

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

scripts: imx-image: document -d, -e, -s, -u ...

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

MIPS: use anonymous labels in ENTRY_FUNCTION_END and STOP_WITH_DEBUG_EVENT macros ...

Use of global labels of the same name inside ENTRY_FUNCTION_END and
STOP_WITH_DEBUG_EVENT prevents simultaneous use of both macros. It also
prevents multiple use of one of them.

Signed-off-by: Peter Mamonov <pmamonov@gmail.com>
Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>