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'

Merge branch 'for-next/misc'

Merge branch 'for-next/layerscape'

Merge branch 'for-next/dtc'

rsa: Allow to directly compile in rsa public keys ...

So far we relied on the U-Boot mkimage tool to generate us device tree
snippets containing rsa public keys which we then compiled into barebox.
Make this easier and allow to directly specify a filename or PKCS#11 URI
in Kconfig. With this we no longer need the U-Boot mkimage tool here and
no more external steps to prepare device tree snippets.

With this rsa public keys can be directly compiled as C structs into
barebox which is much more direct than putting it into the device tree.

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

scripts: Add rsatoc tool ...

The rsatoc tool converts rsa public keys into C structs suitable to
compile with barebox. Most of the openssl rsa related stuff has been
taken from the U-Boot mkimage tool.

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

Kbuild: Add config_filename macro from kernel ...

The config_filename allows to extract a filename from a Kconfig string
option.

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

kbuild, LLVMLinux: Add -Werror to cc-option to support clang ...

Clang will warn about unknown warnings but will not return false
unless -Werror is set. GCC will return false if an unknown
warning is passed.

Adding -Werror make both compiler behave the same.

[arnd: it turns out we need the same patch for testing whether -ffunction-sections
       works right with gcc. I've build tested extensively with this patch
       applied, so let's just merge this one now.]

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
Signed-off-by: Behan Webster <behanw@converseincode.com>
Reviewed-by: Jan-Simon Möller <dl9pf@gmx.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
[afa: ported to barebox from upstream c3f0d0bc5b01ad9]
Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts/dtc: Update to upstream version v1.5.1 ...

This adds the following commits from upstream dtc:

60e0db3d65a1 Ignore phandle properties in /aliases
95ce19c14064 README: update for Python 3
5345db19f615 livetree: simplify condition in get_node_by_path
b8d6eca78210 libfdt: Allow #size-cells of 0
184f51099471 Makefile: Add EXTRA_CFLAGS variable
812b1956a076 libfdt: Tweak data handling to satisfy Coverity
5c715a44776a fdtoverlay: Ignore symbols in overlays which don't apply to the target tree
b99353474850 fdtoverlay: Allow adding labels to __overlay__ nodes in overlays
d6de81b81b68 pylibfdt: Add support for fdt_get_alias()
1c17714dbb3a pylibfdt: Correct the FdtSw example
ad57e4574a37 tests: Add a failed test case for 'fdtoverlay' with long target path
bbe3b36f542b fdtoverlay: Rework output allocation
6c2e61f08396 fdtoverlay: Improve error messages
297f5abb362e fdtoverlay: Check for truncated overlay blobs
702c1b6c0e73 README.license: Update to reflect SPDX tag usage
4097bbffcf1d dtc: Add GPLv2 SPDX tags to files missing license text
94f87cd5b7c5 libfdt: Add dual GPL/BSD SPDX tags to files missing license text
c4ffc05574b1 tests: Replace license boilerplate with SPDX tags
a5ac29baacd2 pylibfdt: Replace dual GPLv2/BSD license boilerplate with SPDX tags
7fb0f4db2eb7 libfdt: Replace GPL/BSD boilerplate/reference with SPDX tags
acfe84f2c47e dtc: Replace GPLv2 boilerplate/reference with SPDX tags
87963ee20693 livetree: add missing type markers in generated overlay properties
825146d13dc0 Fix typos in various documentation and source files
25bb080c18d1 Update the GPL2 text to the latest revision
243176c4ce84 Fix bogus error on rebuild
ce01b21098a4 libfdt: Add FDT_CREATE_FLAG_NO_NAME_DEDUP flag that trades size for speed
fbb62754ce45 libfdt: Introduce fdt_create_with_flags()
228a44cce857 libfdt: Ensure fdt_add_property frees allocated name string on failure
8f695676227b Avoid assertion in check_interrupts_property()
5c3513f68921 Link tools and tests against libfdt shared library
00f9febf9c16 tests: Rename tests.sh to testutils.sh
c5d45188f923 Clean up LDLIBS handling
6ef8fcd05b74 Rebuild libfdt shared object if versioning linker script changes
26ee65a16c38 Use Python3 by default
cca6546244cb libfdt: Make fdt_get_max_phandle() an inline
730875016a6a libfdt: Add phandle generation helper
7dfb61ba96b1 libfdt: Use fdt_find_max_phandle()
2bc5b66d7f6c libfdt: Add new maximum phandle lookup function
7fcf8208b8a9 libfdt: add fdt_append_addrrange()
ae795b2db7a4 checks: Do not omit nodes with labels if symbol generation is requested
eac2ad495b29 Update version.lds again
f67b47135523 Revert "libfdt: Add phandle generation helper"
54ea41c22415 libfdt: Add phandle generation helper
4762ad051ee0 checks: Fix spelling in check_graph_endpoint

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

ARM: Compile dtbs for lowlevel code ...

When no PBL is used then the DTB is used in the real barebox binary. We
already have lwl-y for code which needs to be in PBL when existing and
in the real barebox binary otherwise. Do the same for the DTBs and
compile them with lwl-dtb-y.

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

scripts/dtc: mention dtc project in update-dtc-source.sh commit message ...

update-dtc-source.sh generates the commit message after it runs
to completion. The word upstream is often used to refer to the
Linux kernel within barebox, so change the wording to refer
explicitly to dtc upstream.

Cc: Roland Hieber <r.hieber@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Acked-by: Roland Hieber <rhi@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts/dtc: git rm old files as part of update process ...

To avoid keeping stale files in the scripts/dtc directory, care had to
be taken to delete all files except for the ones native to barebox.
Make this less error-prone by having careupdate-dtc-source.sh delete
these files as part of the update process.

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

scripts/dtc: reinstate building of fdtget along with dtc ...

Unlike Linux, barebox has a build-time dependency on the fdtget utility.
For this reason, we can't import the kernel dtc Makefile by mere
copying. Reinstate the fdtget-specific bits that got lost in the
last dtc update. This fixes barebox imd generation which has caused
following error message in master:

	gen-dtb-s: line 37: scripts/dtc/fdtget: No such file or directory

Fixes: 4e731e48d4 ("scripts/dtc: Update to upstream version v1.5.0")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts/dtc: Reinstate barebox-specifics in update-dtc-source.sh ...

The barebox update-dtc-source.sh differs from the Linux one in that it
installs fdtget as well, because it's required for barebox IMD to work.
Readd fdtget.c to DTC_SOURCE and while at it reinstate the old comments.

Fixes: 46bdae84e8 ("dtc: Update update-dtc-source.sh from Linux")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts: Remove NETX image tool ...

NETX support has been removed from barebox. Remove its image built tool
as well.

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

scripts: pblimage: explicitly set architecture to ARM ...

architecture is statically initialized to zero, which happens to be
ARCH_ARM as it's the first enum constant.
Make this a bit clearer by explicitly assigning ARCH_ARM to architecture.

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

dtc: optionally add add __symbols__ to build-in devicetree ...

The devicetree overlay driver requires the __symbols__ node to resolve
phandles to the base devicetree. If Barebox has to apply the overlay to
the live devicetree, the build-in devicetree must be built with the
__symbols__ node.

It is configurable, because adding __symbols__ significantly increases
the size of the devicetree binary. When configuring Barebox, a developer
should be able to enable or disable devicetree overlay support and as
this only affects the build-in devicetree, which is linked to the image
anyway, use a Kconfig item for configuring the __symbols__.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/qemu'

common: add generic CONFIG_UBSAN plumbing ...

-fsanitize=undefined allows compile-time instrumentation of code to detect
some classes of runtime undefined behavior.

In preparation for allowing arches to provide infrastructure in support
of this feature, add some generic UBSAN options and associated plumbing.

These are only shown in the debug menu when the arch selects the
appropriate symbol. The option is named equally to their Linux counterparts.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

scripts/dtc: Update to upstream version v1.5.0 ...

This adds the following commits from upstream:

d37f6b2 Bump version to v1.5.0
a4b1a30 pylibfdt:tests: Extend the way how to find a Python module
625dd8a pylibfdt: Change how passing tests are recognized
3646316 pylibfdt: Test fdt.setprop take bytes on Python 3, add error handling
cb0f454 pylibfdt: check_err accepts only integer as a first argument.
4b68c6b pylibfdt: Proper handling of bytes/unicode strings and octal literals
78e113e Use PRIxPTR for printing uintptr_t values
ea7a8f6 libfdt: Fix FDT_ERR_NOTFOUND typos in documentation
5aafd7c libfdt: Fix fdt_getprop_by_offset() parameter name in documentation
7cbc550 checks: Add unit address check if node is enabled
f267e67 checks: Fix crash with multiple source annotations
3616b9a checks: Use source position information for check failures
2bdbd07 checks: Make each message output atomic
a1eff70 util: Add xa{v}sprintf_append functions
82a52ce libfdt: Add a test for fdt_getprop_by_offset()
607b858 PEP8 / Flake8 cleanups for setup.py
f9c0a42 Remove broken objdir / srcdir support
5182b5e pylibfdt: Use common PREFIX variable
d45bf1f Refine make tests_clean target
99284c4 Refine pylibfdt_clean target
a4629cf Refine libfdt_clean target
08380fc tests: Use modern octal literals for Python
8113c00 pylibfdt: Allow switch to Python 3 via environment variable PYTHON
11738cf libfdt: Don't use memcpy to handle unaligned reads on ARM
86a288a checks: Restructure check_msg to decrease indentation
5667e7e annotations: add the annotation functionality
8e20ccf annotations: add positions
ca930e2 tests: Don't lose errors from make checkm
43366bb tests: Property count valgrind errors in wrapped tests
5062516 srcpos: Remove srcpos_empty
a3143fa Revert "annotations: add positions"
403cc79 checks: Update SPI bus check for 'spi-slave'
baa1d2c annotations: add positions
ff2ad38 Merge remote-tracking branch 'origin/pr/18'
aa7254d libfdt: return correct value if #size-cells property is not present
49903ae use ptrdiff_t modifier for printing pointer differences
da2b691 treesource: Fix dts output for phandles in middle of a sequence of ints
8f8b77a tests: Wrap check_align() calls with base_run_test()
522d81d Fix dts output with a REF_PATH marker
e45198c Added test cases for target references
0fcffda Merge nodes with local target label references
1e4a092 pylibfdt: Don't have setup.py depend on where it's invoked from
ca399b1 pylibfdt: Eliminate run_setup make function
98972f1 pylibfdt: Improved version extraction
7ba2be6 pylibfdt: Don't silence setup.py when V=1
7691f9d pylibfdt: Make SETUP make variable
855b996 pylibfdt: Simpler CFLAGS handling
47cafbe pylibfdt: Link extension module with libfdt rather than rebuilding
dd695d6 pylibfdt: Correctly set build output directory
5932752 pylibfdt: We don't need include files from the base directory
e84742a checks: fix simple-bus compatible matching
8c59a97 Fix missing labels when emitting dts format
d448f9a Revert dts output formatting changes of spaces around brackets
c86da84 Add support for YAML encoded output
361b5e7 Make type_marker_length helper public
bfbfab0 pylibfdt: Add a means to add and delete notes
9005f41 pylibfdt: Allow delprop() to return errors
b94c056 Make valgrind optional
fd06c54 tests: Better testing of dtc -I fs mode
c3f50c9 tests: Allow dtbs_equal_unordered to ignore mem reserves
0ac9fde dtc: trivial '-I fs -O dts' test
0fd1c8c pylibfdt: fdt_get_mem_rsv returns 2 uint64_t values
04853ca pylibfdt: Don't incorrectly / unnecessarily override uint64_t typemap
9619c86 Kill bogus TYPE_BLOB marker type
ac68ff9 parser: add TYPE_STRING marker to path references
90a190e checks: add SPI bus checks
53a1bd5 checks: add I2C bus checks

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

dtc: Update update-dtc-source.sh from Linux ...

This updates update-dtc-source.sh from Linux-5.3-rc4.

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