Merge branch 'for-next/misc'

Merge branch 'for-next/imx'

scripts/bareboximd: add mode argument to open call ...

Newer gcc complain about missing mode argument when a new file is
created. This is an extract of man-pages:

 "The mode argument specifies the file mode bits be applied when
 a new file is created.  This argument must be supplied when
 O_CREAT or O_TMPFILE is specified in flags"

Signed-off-by: Franck Jullien <franck.jullien@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts: imx-usb-loader: Fix i.MX8MM ...

Most things valid for the i.MX8MQ are needed for the i.MX8MM as well, so
add a common macro which returns true for both SoCs and use it where
appropriate. Also we have to search for the i.MX header in a bigger area
as it is at offset 33KiB.

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

scripts: imd: remove duplicate macro definitions ...

include/scripts/linux/kernel.h included via #include <linux/kernel.h>
later on already defines these three macros. Remove them here to avoid
the warnings about the duplicate macro definition.

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

scripts: define ALIGN(x) in scripts' <linux/kernel.h> ...

To make code sharing between utilities in scripts/ and barebox easier,
define ALIGN in the scripts/include/linux/kernel.h as well for
compatibility with the barebox include/linux/kernel.h.

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

scripts: imx-image: Add i.MX8MM support ...

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

scripts: imx-usb-loader: Add i.MX8MM support ...

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

scripts: imx-usb-loader: Add 2nd stage loading support ...

This adds the host part for 2nd stage uploading in case the RAM setup is
done in code. This works in conjunction with "usb: gadget: fsl_udc: Add
PBL image loading support".

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

Merge branch 'for-next/misc'

Merge branch 'for-next/imx'

scripts: imx-usb-loader: dladdr is unused, remove it ...

The download address is the same as the place we put the header to, so
we can drop the calculation of dladdr and use header_addr directly.

Tested on i.MX51, i.MX53 and i.MX6

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

scripts: imx-usb-loader: download address is always the header address ...

We always have to upload the image beginning with the header, we have
to skip everything that is before the header.
In MODE_BULK this is explicit, but in HID mode this is obfuscated by
doing several calculations with helper variables. Drop this and simplify
code.

Tested on i.MX51, i.MX53 and i.MX6

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

scripts: imx-usb-loader: remove unnecessary check ...

file_base is the address where the image would be loaded to if we were
not skipping the unused space before the header in the image. I can't
see any reason why this should be higher than the download address.
Drop this superfluous check.

Tested on i.MX51, i.MX53 and i.MX6

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

scripts: imx-usb-loader: Accept new header version ...

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

scripts: imx: Remove unused variable ...

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

imd: add support for checksum generation/verification ...

Add a new imd type "checksum". This type consists of the CRC32 checksum
of the whole barebox image minus the checksum itself.
The checksum can be written to the imd field with the bareboximd host-tool.
It can be verified with said tool or with "imd" on the target.

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

Merge branch 'for-next/misc'

habv4: imx change signing area from full to the executed image ...

the whole barebox with mbr and partition table were be signed by default.
change the signing to the executed image without signing the mbr,
partition table and header_gap by imx8mq
additional delete option full, from-dcdofs and skip-mbr

Signed-off-by: Maik Otto <m.otto@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Allow usage of default environment without environment file storage ...

Currently, the default environment is only used when the
barebox environment on the persistent store is not valid
or when ENVFS_FLAGS_FORCE_BUILT_IN is set in the super block.

However, ENVFS_FLAGS_FORCE_BUILT_IN can be cleared and the
environmnet variables in the persistent store will be
used again. This may not be desirable.

This patch allows building CONFIG_DEFAULT_ENVIRONMENT
independent of CONFIG_ENV_HANDLING. This can be useful
if you never want to load or write values from the
persistent store and you only need to read environment variables
from your default environment.

If CONFIG_ENV_HANDLING is not set, a message will be printed to the
user indicating that changes to non-volatile variables won't be
persisted.

Move envfs functions that are needed when CONFIG_DEFAULT_ENVIRONMENT
and/or CONFIG_ENV_HANDLING is set to a new file common/envfs-core.c.

Signed-off-by: Albert Schwarzkopf <a.schwarzkopf@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/zynq'

Merge branch 'for-next/shebang'

scripts: use #!/usr/bin/env bash shebang instead of #!/bin/bash ...

Some distributions might not have bash in /bin, but in $PATH.

Using #!/usr/bin/env bash solves this, and is consistent with how the
perl and python shebangs look like in the tree.

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

scripts: imx: report file where error occurred ...

Especially when using #include directives in imxcfg files, error
messages can be hard to follow because line numbers differ between
preprocessor and source files. Teach the imx image generation tool about
preprocessing line number / file name directive, so it can give more
useful error messages. Instead of:

  error in line 11: Invalid argument

It now says:

  $barebox/arch/arm/boards/$som/flash-header-$board.imxcfg:5: Invalid argument

No change in compiled barebox binaries.

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

ARM: zynq: add size check in zynq_mkimage ...

Currently Barebox does not support 2 stage loading on Zynq, so the
image must fit into the free OCRAM area. Add a check to the mkimage
tool to validate this.

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

ARM: zynq: move header generation to zynq_mkimage ...

Instead of generating a suitable image header with linker magic, move
all of this into zynq_mkimage. The configuration file format and parsing
is based on imx-image. This gets us one step further on the road to
proper multi-image support.

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

ARM: zynq: use getopt in zynq_mkimage ...

Makes extending the command line much easier.

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

kbuild: remove ar-option ...

Linux commit 13dc8c029cab ("kbuild: remove ar-option and KBUILD_ARFLAGS")
removed this already.

Barebox has never used this macro.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/rsa'

Merge branch 'for-next/of-overlay'