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>

imx-bbu-nand-fcb: print page numbers instead of block numbers ...

The whole file uses NAND page numbers, so for clarity print the
message about where the new firmware is written to with page numbers
aswell. Also refer to the slot the firmware is written into.

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

common: state: check length ...

if written_length is read from a partial written bucket it may be to
big and xmalloc will panic barebox.

Check if the value is sane. Make read_len unsigned to avoid negative
values.

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

serdev: Do not call .receive_buf() callback recursively ...

Code implementing .receive_buf() callback can potentially call
serdev_device_write(), which will call serdev_device_poller(). We need
to make sure that such a call is a no-op in order to prevent
corrupting shared data buffer as well as breaking .receive_buf
callback that most likely does not expect that to happen.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Tested-by: Cory Tusar <cory.tusar@zii.aero>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/misc'

Merge branch 'for-next/layerscape'

bbu: In bbu_register_std_file_update detect device before accessing it ...

The device the standard file update handler writes to may not be present
before detecting it, so as a first step detect it.

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

bbu: bbu_register_std_file_update should take const char* ...

String arguments to bbu_register_std_file_update should be const.

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

filetype: Detect Layerscape PBL images ...

The Layerscape SoCs have their own boot image format. Add filetype
detection for it.

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

defaultenv: Convert init script to C ...

It's hard to get more complicated things right in hush. This commit
converts the /env/bin/init script to C code. With this we get a better
error handling and better control what is being done.

If /env/bin/init exists in the environment then it is still executed
instead of the corresponding C code.

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

console_countdown: Add pattern list ...

This adds an optional string argument to console_countdown() which can
hold a list of keys which also abort the countdown.

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