Merge branch 'for-next/stm32'

Merge branch 'for-next/pstore'

pstore: Only capture log messages ...

With this pstore only captures barebox log messages printed with pr_*
and dev_*, but no longer anything printed with printf and friends.

When capturing the barebox output with pstore only the log messages are
of interest, but not the ones printed with printf and certainly not
the things typed interactively on the command line. These are logged
currently because we register pstore as a barebox console. Instead, hook
into pr_puts which only outputs the barebox log messages.

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

blspec: invalidate only necessary bootm variables ...

Instead of removing all global bootm variables, remove only the ones
which will be set by the blspec entries. This allows setting the
bootm.tee variable to load OP-TEE for blspec entries or setting the
image load address.

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

startup: Factor out the autoboot counter to separate function ...

The autoboot countdown is part of the init function. This patch factors
out this code to a separate function to allow boards to call it at a
different time. Also boards can set the autoboot state manually in case
they have its own idea how to interrupt the autoboot process.

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

startup: Create boot related variables where they are used ...

global.boot.default, global.linux.bootargs.base and global.user are
used in the boot code, so create them there.

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

startup: Create global.linux.bootargs.dyn.* variables where they are needed ...

global.linux.bootargs.dyn.* variables are exclusively used in boot
scripts, so create them right before executing a script. This moves
the corresponding code from the unrelated startup code to the place
where the variables are used.

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

startup: remove unused editcmd variable ...

Nobody uses global.editcmd, so remove it.

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

add CONFIG_PBL_BREAK option ...

With this option barebox will be build with breakpoint instruction
in early pbl stage.

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

reset_source: add new Brownout reset (BOR) source ...

The STM32MP1 can report brown out as reason for a reset,
which doesn't fit into existing reasons. Thus add a new
one to the enumeration.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

startup: execute /env/bin/init as part of the initial shell ...

Commit 90df2a955e3c ("defaultenv: Convert init script to C")
unintentionally changed the way the legacy "/env/bin/init" script is
run, so that it runs in a sub-shell context, effectively changing
`run_command("source /env/bin/init");` to
`run_command("/env/bin/init");`.  Therefore, any changes to shell
environment variables made by the script are undone when the script
exits.  This patch reverts back to the old behavior.

Fixes: 90df2a955e3c ("defaultenv: Convert init script to C")
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

startup: Do not overwrite global.linux.bootargs.console ...

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

Merge branch 'for-next/ubootenv'

Merge branch 'for-next/misc'

Merge branch 'for-next/imx'

Merge branch 'for-next/at91'

Merge branch 'for-next/arm'

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>

filetype: Allow specifying cdev's filetype explicitly ...

Allow specifying cdev's filetype explicitly to support the cases where
the type of a cdev is known apriori, yet cannot be determined by
reading the cdev's content.

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

filetype: Add "U-Boot environmemnt variable data" filetype ...

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
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>

libbb: Drop simple_itoa() ...

Hush is the only one user of simple_itoa() and the code there can be
re-implemented using snprintf(). Change the code to get rid of
simple_itoa().

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

ARM: at91: debug_ll: make UART base address configurable ...

This is in line with other platforms such as i.MX, which allow
specifying a debug port. As we can't use port indices because
the UARTs aren't mapped consecutively, allow specifying a hex
base at configuration time.

A side effect of this patch is that sama5d4's HAVE_AT91_DBGU2
is now honored as well. Previously anything besides DBGU0
defaulted to DBGU1.

Fixes: 06a0773ee31 ("ARM: at91: add sama5d4 soc support #2")
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Tested-by: Sam Ravnborg <sam@ravnborg.org>
[afa: moved base address defaults to common/Kconfig]
Signed-off-by: Ahmad Fatoum <afa@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

imx-bbu-nand-fcb: exchange firmware slots when used firmware is refreshed ...

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

imx-bbu-nand-fcb: refresh unused firmware when it needs refresh ...

So far we only refreshed the unused firmware when it differs from the
used one, but we also have to refresh it when the pages need a cleanup
(-EUCLEAN returned).

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

imx-bbu-nand-fcb: return positive result when firmware needs cleanup ...

The caller of read_firmware() expects a positive return value when a
firmware is readable but needs a cleanup, so return 1 instead of
-EUCLEAN. Without this a firmware will never be refreshed.

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

imx-bbu-nand-fcb: make info messages in read_firmware_all() clearer ...

When talking about primary and secondary firmware also say in which slot
they are. Also, when talking about the slot say if it's the primary or
secondary firmware in that slot.

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

imx-bbu-nand-fcb: always print info messages in read_firmware_all() ...

read_firmware_all() prints some info messages at the end. There's
one case where we bail out early and no messages are printed. This
is confusing, drop the return and always print messages.

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

imx-bbu-nand-fcb: print primary/secondary firmware page numbers ...

When rewriting FCBs print information where the primary and where the
secondary firmware will be. This allows to check consistency with
earlier messages.

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