Merge branch 'for-next/misc'

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>

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>

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>

Merge branch 'for-next/imx8-hab'

IMX: do_hab calls strcat on uninitialised memory

scripts: imx: support signing for i.MX8MQ ...

Implement signing of the PBL for i.MX8MQ.
The imagesize is also modified to i.MX8MQ to only contain the PBL.
This obsoletes the max_load_size, which is kept for other boards
currently using it.

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

Merge branch 'for-next/macos'

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>

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>

scripts: imx-usb-loader: don't depend on unportable headers ...

<sys/io.h> is non-standard and even unavailable on some Linux
systems, like arm64. Drop it as it's unused anyway.

<endian.h> is Linux-specific, so don't include it directly, but
let "compiler.h" figure out, whether it should be included.

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

scripts: use "compiler.h" endianness helpers ...

<endian.h> may not exist on other systems, don't include it
directly, but include "compiler.h", which either includes
it or provides a suitable alternative if possible.

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

scripts: imx-image: make read_file behaviour consistent ...

When read_file fails then it exits the program in most cases. Let's exit
the program when stat() fails aswell, so that we *always* exit the
program on failure. Drop all error handling for read_file since that's
no longer necessary and rename the function to xread_file to make
clear it won't fail.

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

scripts: imx-image: Be more informative on open errors ...

When opening a file fails then consistently print a message which
file we cannot open and why. In one place no error checking was done at
all, so add this.

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

kbuild: rename HOSTLOADLIBES_* to HOSTLDLIBS_* ...

This is needed to resync kconfig to the latest Linux.

Refer to Linux commit 8377bd2b9ee1 ("kbuild: Rename HOST_LOADLIBES
to KBUILD_HOSTLDLIBS").

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

scripts: imx-image: fix build with OpenSSL < 1.1.0 ...

When adding support for OpenSSL 1.1.x it was missed that EVP_PKEY_get0_RSA
is only available with that version. Earlier versions don't provide a fully
equivalent function, so add it to the compatibility helpers.

Fixes: 542a50d4eb (scripts: imx-image: fix build with OpenSSL 1.1.x)
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts: imx-image: Add support for max_load_size option ...

When an image is loaded to SRAM we can normally only load a part of the
full image, limited by the available space in SRAM. We currently load
the pblb image which is the executable part of the PBL without the
compressed barebox payload. We are going to link the compressed barebox
image into the pbl image though, so we can't see the desired load size
from outside the image anymore.

This adds a max_load_size option to set this size explicitly.

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

scripts: imx-image: Fix typos in comments ...

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

scripts: imx-image: fix first instruction in i.MX8MQ header ...

The instruction being patched in was a branch to 0x24000, instead of
the intended 0x9000. This doesn't matter when starting the image from
a regular boot source, but breaks starting the image via bootm, as we
rely on the jump in the first header instruction taking us to the
actual code.

As the code offset changes depending on the presence of the signed
HDMI firmware, compute the offet dynamically while building the image.

Fixes: 6d2132a9ded7 (scripts: imx-image: Add i.MX8MQ support)
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts: imx-usb-loader: list_imx_device_types(): move variable declaration out of for() loop ...

On older compilers this causes the following error:
| scripts/imx/imx-usb-loader.c: In function 'list_imx_device_types':
| scripts/imx/imx-usb-loader.c:252:2: error: 'for' loop initial declarations are only allowed in C99 mode
|   for (int i = 0; i < ARRAY_SIZE(imx_ids); i++) {
|   ^
| scripts/imx/imx-usb-loader.c:252:2: note: use option -std=c99 or -std=gnu99 to compile your code

Fixes: bcc2df673cdb ("scripts: imx-usb-loader: allow use of unknown USB IDs")
Reported-by: Niklas Reisser <Niklas.Reisser@de.bosch.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/imx-hab'

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>

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>