Merge branch 'for-next/net'

Merge branch 'for-next/misc'

Merge branch 'for-next/kconfig'

Merge branch 'for-next/imx'

memory_display: Fix type of argument passed to %*s ...

On AArch64, pointer arithmetic in (pos - line) resolves into "long
int", whereas "%*s" is expecting regular "int". Add explicit cast to
avoid compiler warnings.

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

envfs: Sort files when generating on build machine ...

The resulting environment was dependend of the build machines'
filesystem, i.e. the order in which readdir returns dirents depends on
the filesystem implementation.

Sort file entries in scripts/bareboxenv.c for generating a reproducible
built-in environment.

Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

common: state: fix another alignment ...

Fixes: 7126dffd0be ("common: state: Add variable_type to state_variable")
Fixes: 6096a0cfa4a ("common: state: fix alignment")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

common: state: fix alignment ...

Fixes: 7126dffd0be ("common: state: Add variable_type to state_variable")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

defaultenv: resolve global.net.server before using it ...

global.net.server may contain a hostname, so we have to resolve it
before using it.

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

defaultenv: defaultenv uses ip_route_get ...

The default environment uses the ip_route_get command, so select it
when networking is enabled.

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

imx-bbu-nand-fcb: Remove unused variable partition_size ...

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

imx-bbu-nand-fcb: Check the required space a bit earlier ...

If the partition size is too small for imx_bbu_nand_update(),
this can lead to an infinite loop in the imx_bbu_firmware_fcb_start_page()
function, because imx_bbu_firmware_max_blocks() returns zero.
Fix this by place imx_bbu_firmware_max_blocks() a bit early.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

kconfig: sync to Linux 4.20 ...

The previous sync was commit 18895514dc5e ("kconfig: update to
v3.18-rc6").

Some commits were applied on top of that since then, but equivalent
fixups were done in Linux.

So, this commit overwrites everything scripts/kconfig/ with the one
from Linux 4.20

Highlights:

 - 'silentoldconfig' has been renamed to 'syncconfig'
   (the top Makefile needs to be adjusted)

 - 'testconfig' target has been added for unit-tests
   (the top Makefile needs to export PYTHON3 because
    the test frame relies on Python3 and pytest)

 - The perfect hash table generated by gperf has been removed

 - The localization support has been removed

 - The 'option env=VAR' has been replaced with more generic
   variable reference syntax $(VAR)
   (./Kconfig and common/Kconfig need to be adjusted)

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

globalvar: fix crash if CONFIG_NVVAR is not set ...

At the moment globalvar code tries to use nv_device
even if nv_device is not registered.

How to reproduce the problem:

    barebox$ make sandbox_defconfig
    ...
    barebox$ sed -i "s/\(CONFIG_NVVAR\)=y/# \1 is not set/" .config
    barebox$ sed -i "s/\(CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW\)=y/# \1 is not set\n# CONFIG_DEFAULT_ENVIRONMENT_GENERIC is not set/" .config
    barebox$ make oldconfig
    ...
    barebox$ make
    ...
    barebox$ ./barebox
    Segmentation fault

This patch blocks nv_device use if CONFIG_NVVAR is not set.

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

Merge branch 'for-next/net'

Merge branch 'for-next/missing-prototypes'

Merge branch 'for-next/checkpatch'

common/parser.c: s/%d/%zu/ when printing size_t ...

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

Add pr_memory_display ...

pr_memory_display is a memory_display variant that takes a MSG_*
loglevel priority with which the hexdump is printed. Like the
normal pr_* function this is optimized out when the priority is
below the compile time priority.

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

memory_display: Print whole line at once ...

Instead of using many printf assemble a printed line first and
print it at once. This has the purpose of being able to pick
different output functions in the next step.

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

net: dns: return error codes ...

The resolv() function used to return the IP address. When net_udp_new()
fails we return an error code though which the callers of resolv() take
as an IP address. This is wrong of course and we could return 0 in this
case. Instead we return an error code and pass the resolved IP as a
pointer which allows us to return proper error codes.

This patch also adds error messages and error returns to the various
callers of resolv() which used to just continue with a zero IP and
let the user figure out what went wrong.

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

imd: fix missing error message ...

imd -t just returns 'imd: error 61', if there is not tag for <type>

reference: common/imd.c:357 if (!imd) { ...
Signed-off-by: Thorsten K. Scherer <t.scherer@eckelmann.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

hush: Add extra define for hush debugging ...

I've seen people increasing the compile loglevel to get more debugging
output from barebox. This is generally a good idea, but the tons of hush
debugging printed makes barebox quite unusable. This patch puts hush
debugging behind an extra HUSH_DEBUG define so increasing the compile
loglevel no longer results in hush debugging.

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

hush: Add pr_fmt define ...

To give the hush debug output more context.

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

FIT: support hash-1/signature-1 nodes in signature check ...

The examples in the U-boot docs use "hash-N" and "signature-N" as the names
for hash/signature nodes. It seems "@N" was used instead at some point
during the development of the FIT format and "-N" is more correct (in fact,
dtc throws warnings when using "@N" without a reg attribute). Support for
the "@N" node names is preserved for backward compatibility.

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

memory_display: add padding to simplify counting ...

Trying to count single bytes (e.g. when adding an offset) in 'word' or
'byte' output mode is not easy in the current formatting, and (at least
for me) has a high chance of miscounting or losing track of groups:

    barebox@boardname:/ md -b 0x149983f0+32
    149983f0: 18 00 00 00 00 00 0d 86 00 00 00 00 00 00 00 00    ................
    14998400: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00    ................

    barebox@boardname:/ md -w 0x149983f0+32
    149983f0: 0018 0000 0000 860d 0000 0000 0000 0000            ................
    14998400: 0000 0000 0000 0000 0000 0000 0000 0000            ................

With an additional space after 8 bytes, counting becomes easier:

    barebox@boardname:/ md -b 0x149983f0+32
    149983f0: 18 00 00 00 00 00 0d 86  00 00 00 00 00 00 00 00   ................
    14998400: 00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00   ................

    barebox@boardname:/ md -w 0x149983f0+32
    149983f0: 0018 0000 0000 860d  0000 0000 0000 0000           ................
    14998400: 0000 0000 0000 0000  0000 0000 0000 0000           ................

The 'quad' and 'long' output modes stay the same and are already much
more easier to count because they build bigger and therefore less groups
of bytes per line.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

state: remove unused function ...

state_find_type() is unused and doesn't have a prototype. Remove it.

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

ddr_spd: remove unused array ...

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

bootm: Print which file cannot be opened ...

When opening the OS image fails we used to print a message *which* file
could not be opened. This message is no longer printed since we now fail
in read_file_2 when there is an error. Move the message in the
read_file_2 failure path to print it again. file_detect_type() needs no
handling for ret < 0, in case of failure it returns filetype_unknown
which is handled later, so we can remove the error handling there.

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

ubiformat: print messages after checking a block is not bad ...

ubiformat prints its "flashing eraseblock x" and "formatting eraseblock
x" messages before having checked that a block is actually good. This
is misleading, so first check if a block is good and only if it is
print a message.

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