June 2024 - U-Boot

[PATCH 1/2] spi: soft_spi: fix miso gpio property name
by Mikhail Kshevetskiy 02 Jul '24

02 Jul '24

Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy(a)iopsys.eu> --- drivers/spi/soft_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index 0fa14339bdc..3fe62818a44 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -272,7 +272,7 @@ static int soft_spi_probe(struct udevice *dev) ret = gpio_request_by_name(dev, "gpio-miso", 0, &plat->miso, GPIOD_IS_IN); if (ret) - ret = gpio_request_by_name(dev, "gpio-miso", 0, &plat->miso, + ret = gpio_request_by_name(dev, "miso-gpios", 0, &plat->miso, GPIOD_IS_IN); if (ret) plat->flags |= SPI_MASTER_NO_RX; -- 2.43.0

3 4

[RFC 0/1] FIT documentation link vs copy
by Sam Povilus 02 Jul '24

02 Jul '24

I'm proposing linking the FIT documentation instead of double book keeping it, it does have the disadvantage of making it more difficult to see the documentation especially if offline. Sam Povilus (1): doc: Remove FIT documentation that is elsewhere doc/usage/fit/index.rst | 14 +- doc/usage/fit/source_file_format.rst | 682 +-------------------------- 2 files changed, 5 insertions(+), 691 deletions(-) -- 2.34.1

2 4

uboot 2024.07 regression
by Frank Wunderlich 01 Jul '24

01 Jul '24

Hi, while testing clock-patches for mediatek as preparation for OF_upstream i've noticed an issue on mt7623 based board (bananapi r2) with ethernet (no ping possible) in 2024.07-rc1 where 2024.04 is good. i bisected it to this commit: ff3bcb17f436 2024-02-23 Makefile: pass -undef option to cmd_gen_envp and when reverting this commit in 2024.07 ethernet works it seems not yet reported or reverted (till 2024.07-rc4). I'm not sure why this commit breaks network on this board, but revert confirms it... regards Frank

2 4

[PATCH 1/1] tools: patman: fix `pip install` with Python 3.12
by Brandon Maier 01 Jul '24

01 Jul '24

Installing patman with `cd ./tools/patman && pip install -e .` fails with the error below. As described in the error output, the license line is not allowed to be only defined in the setup.py. > $ cd ./tools/patman && pip install -e . > Obtaining file:///.../u-boot/tools/patman > Installing build dependencies ... done > Checking if build backend supports build_editable ... done > Getting requirements to build editable ... error > error: subprocess-exited-with-error > > × Getting requirements to build editable did not run successfully. > │ exit code: 1 > ╰─> [61 lines of output] > /tmp/pip-build-env-mqjvnmz8/overlay/lib/python3.12/site-packages/setuptools/config/_apply_pyprojecttoml.py:76: > _MissingDynamic: `license` defined outside of `pyproject.toml` is ignored. > !! > > ******************************************************************************** > The following seems to be defined outside of `pyproject.toml`: > > `license = 'GPL-2.0+'` > > According to the spec (see the link below), however, setuptools CANNOT > consider this value unless `license` is listed as `dynamic`. > > https://packaging.python.org/en/latest/specifications/pyproject-toml/#decla… > > To prevent this problem, you can list `license` under `dynamic` or alternatively > remove the `[project]` table from your file and rely entirely on other means of > configuration. > ******************************************************************************** > > !! Signed-off-by: Brandon Maier <brandon.maier(a)collins.com> CC: Simon Glass <sjg(a)chromium.org> --- tools/patman/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/patman/pyproject.toml b/tools/patman/pyproject.toml index fcefcf66960..9e6079cb57e 100644 --- a/tools/patman/pyproject.toml +++ b/tools/patman/pyproject.toml @@ -17,6 +17,7 @@ classifiers = [ "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)", "Operating System :: OS Independent", ] +dynamic = ["license"] [project.urls] "Homepage" = "https://docs.u-boot.org/en/latest/develop/patman.html" -- 2.45.1

2 3

[PATCH v4 00/14] Introduce the lwIP network stack
by Jerome Forissier 01 Jul '24

01 Jul '24

This is a rework of a patch series by Maxim Uvarov: "net/lwip: add lwip library for the network stack" [1]. The goal is to introduce the lwIP TCP/IP stack [2] [3] as an alternative to the current implementation in net/, selectable with Kconfig, and ultimately keep only lwIP if possible. Some reasons for doing so are: - Make the support of HTTPS in the wget command easier. Javier T. (CC'd) has some additional lwIP and Mbed TLS patches to do so. With that it becomes possible to fetch and launch a distro installer such as Debian etc. using a secure, authenticated connection directly from the U-Boot shell. Several use cases: * Authentication: prevent MITM attack (third party replacing the binary with a different one) * Confidentiality: prevent third parties from grabbing a copy of the image as it is being downloaded * Allow connection to servers that do not support plain HTTP anymore (this is becoming more and more common on the Internet these days) - Possibly benefit from additional features implemented in lwIP - Less code to maintain in U-Boot Prior to applying this series, the lwIP stack needs to be added as a Git subtree with the following command: $ git subtree add --squash --prefix lib/lwip/lwip https://git.savannah.gnu.org/git/lwip.git STABLE-2_2_0_RELEASE The first patch renames some enums in order to avoid a conflict when a later patch enables the lwIP library. The second patch introduces a new Kconfig symbol: NET_LWIP, which selects the lwIP implementation instead of the current one (NET). Contrary to the approach chosen by Maxim in [1], NET_LWIP and NET cannot be enabled simultaneously. The rationale is we want to start from a clean state and not pull potentially duplicated functionality from both stacks. Note however that a few files are still built in net/, they are the ones related to ethernet device management and the ethernet bootflow. The third patch splits the net.h header into net-legacy.h, net-common.h, net-lwip.h, leaving net.h as a simple wrapper. The fourth patch introduces the Makefile to build lwIP when NET_LWIP is enabled. The subsequent patches implement various network-oriented commands and features: dhcp, dns, ping, tftpboot, wget. A number of features are currently incompatible with NET_LWIP: SANDBOX, DFU_TFTP, FASTBOOT, SPL_NET. All make assumptions on how the network stack is implemented and/or pull sybols that are not trivially exported from lwIP. Some interface rework may be needed. Due to the above and in order to provide some level of testing, a new QEMU configuration is introduced (qemu_arm64_lwip_defconfig) which is the same as qemu_arm64_defconfig but with NET_LWIP and CMD_*_LWIP enabled. Tests are added to test/py/tests/test_net.py for that configuration. Changes in v4: - Fixed the DHCP algorithm which was missing a sys_timeout() call in the "fine timer" callback. This should close the issue that Tom R. reported with his Raspberry Pi 3 (it does fix it on mine). - The DHCP exchange timeout is increased from 2 to 10 seconds - The DHCP exchange can be interrupted with Ctrl-C. - "net: introduce alternative implementation as net-lwip/": rework dependencies. A few symbols have 'depends on !NET_LWIP' and in addition 'NET_LWIP depends on !SANDBOX'. Sandbox, DSA and fastboot are unsupported, because they are deeply welded to the current stack. - All network commands (dns, ping, tftp and wget): * Get rid of global variables (Ilias A.) * Use printf() rather than log_info() - "net-lwip: add ping command": use packet count instead of timeout, fix code style (Ilias A.) - Add "net: split cmd/net.c into cmd/net.c and cmd/net-common.c" extracted from the wget patch (Ilias A.). - Add "net: split include/net.h into net{,-common,-legacy,-lwip}.h" (Ilias A.) - Add "flash: prefix error codes with FL_" which is required to avoid name clashes when splitting net.h - Reworked the initialization of the lwIP stack. One and only one network interface (struct netif) is added for the duration of the command that uses that interface. That's commit "net-lwip: add DHCP support and dhcp commmand". - Drop "test: dm: dsa, eth: disable tests when CONFIG_NET_LWIP=y", not needed now that NET_LWIP depend on !SANDBOX. - qemu_arm64_lwip_defconfig now enables CMD_DNS and CMD_WGET (so that all the supported network commands are available). Changes in v3: - Make NET_LWIP a Kconfig choice in patch "net: introduce alternative implementation as net-lwip/" (Tom R.) - Drop the patch introducing lwIP as a Git subtree and document the git command in the cover letter instead (Tom R.) - "net-lwip: add TFTP support and tftpboot command": use the same "Bytes transferred =" message as in the legacy implementation (Tom R., Maxim U.) - Drop "test/py: net: add _lwip variants of dhcp, ping and tftpboot tests" which is not needed anymore. - Add missing kfree() calls in cmd/net-common.c and fix the parsing of decimal address in net-lwip/wget.c (patch "net-lwip: add wget command") (Maxim U.) - "net-lwip: add ping command": drop the ICMP payload (Ilias A.). Set the sequence number to zero when entering ping_loop(). Changes in v2: ** Address comments from Ilias A. - "net-lwip: add wget command" Implement the wget_with_dns() function to do most of the wget work and call it from do_wget(). This allows to simplify patch "net-lwip: add support for EFI_HTTP_BOOT". - "net-lwip: import net command from cmd/net.c" Move a few functions from cmd/net.c to a new file cmd/net-common.c rather than duplicating then in cmd/net-lwip.c. - "net-lwip: add support for EFI_HTTP_BOOT" Since wget_with_dns() is now implemented in "net-lwip: add wget command", just enable the wget command when the lwIP stack is enabled and EFI_HTTP_BOOT is requested. ** Address comments from Tom R. - "net-lwip: add DHCP support and dhcp commmand", "net-lwip: add TFTP support and tftpboot command", "net-lwip: add ping command", "net-lwip: add dns command", "net-lwip: add wget command" Do not introduce new CMD_XXX_LWIP symbols and use existing CMD_XXX instead. - "configs: add qemu_arm64_lwip_defconfig" Use #include <configs/qemu_arm64_defconfig>. - "net-lwip: import lwIP library under lib/lwip" Patch removed and replaced by the introduction of a Git subtree: "Squashed 'lib/lwip/lwip/' content from commit 0a0452b2c3". Note that I have not yet addressed your comments on "test: dm: dsa, eth: disable tests when CONFIG_NET_LWIP=y"). I need some more time for that and I think running CI on this v2 will help better understand what is needed for v3. ** Miscellaneous improvements - "net: introduce alternative implementation as net-lwip/": * Make DFU_OVER_TFTP not DFU_TFTP incompatible with NET_LWIP. It seems quite natural to supplement "depends on NET" with "&& !NET_LWIP". * Make PROT_*_LWIP not visible by removing the Kconfig prompt. [1] https://lore.kernel.org/all/20231127125726.3735-1-maxim.uvarov@linaro.org/ [2] https://www.nongnu.org/lwip/ [3] https://en.wikipedia.org/wiki/LwIP CC: Javier Tia <javier.tia(a)linaro.org> Jerome Forissier (14): flash: prefix error codes with FL_ net: introduce alternative implementation as net-lwip/ net: split include/net.h into net{,-common,-legacy,-lwip}.h net-lwip: build lwIP net-lwip: add DHCP support and dhcp commmand net-lwip: add TFTP support and tftpboot command net-lwip: add ping command net-lwip: add dns command net: split cmd/net.c into cmd/net.c and cmd/net-common.c net-lwip: add wget command cmd: bdinfo: enable -e when CONFIG_CMD_NET_LWIP=y configs: add qemu_arm64_lwip_defconfig MAINTAINERS: net-lwip: add myself as a maintainer CI: add qemu_arm64_lwip to the test matrix .azure-pipelines.yml | 7 + Kconfig | 41 ++ MAINTAINERS | 11 + Makefile | 12 +- board/cobra5272/flash.c | 26 +- board/freescale/m5253demo/flash.c | 6 +- boot/Kconfig | 5 +- cmd/Kconfig | 44 ++ cmd/Makefile | 7 + cmd/bdinfo.c | 5 +- cmd/net-common.c | 109 ++++ cmd/net-lwip.c | 45 ++ cmd/net.c | 115 ---- common/Kconfig | 2 +- common/board_r.c | 4 +- common/flash.c | 44 +- common/spl/Kconfig | 1 + configs/qemu_arm64_lwip_defconfig | 4 + drivers/dfu/Kconfig | 1 + drivers/fastboot/Kconfig | 1 + drivers/mtd/cfi_flash.c | 36 +- drivers/net/Kconfig | 3 +- drivers/net/phy/Kconfig | 2 +- drivers/usb/gadget/Kconfig | 2 +- include/flash.h | 20 +- include/net-common.h | 408 +++++++++++++ include/net-legacy.h | 649 ++++++++++++++++++++ include/net-lwip.h | 36 ++ include/net.h | 944 +----------------------------- lib/Makefile | 2 + lib/lwip/Makefile | 55 ++ lib/lwip/u-boot/arch/cc.h | 43 ++ lib/lwip/u-boot/arch/sys_arch.h | 0 lib/lwip/u-boot/limits.h | 0 lib/lwip/u-boot/lwipopts.h | 197 +++++++ net-lwip/Kconfig | 37 ++ net-lwip/Makefile | 18 + net-lwip/dhcp.c | 108 ++++ net-lwip/dns.c | 117 ++++ net-lwip/eth_internal.h | 35 ++ net-lwip/net-lwip.c | 270 +++++++++ net-lwip/ping.c | 174 ++++++ net-lwip/tftp.c | 226 +++++++ net-lwip/wget.c | 269 +++++++++ net/Kconfig | 14 - 45 files changed, 3008 insertions(+), 1147 deletions(-) create mode 100644 cmd/net-common.c create mode 100644 cmd/net-lwip.c create mode 100644 configs/qemu_arm64_lwip_defconfig create mode 100644 include/net-common.h create mode 100644 include/net-legacy.h create mode 100644 include/net-lwip.h create mode 100644 lib/lwip/Makefile create mode 100644 lib/lwip/u-boot/arch/cc.h create mode 100644 lib/lwip/u-boot/arch/sys_arch.h create mode 100644 lib/lwip/u-boot/limits.h create mode 100644 lib/lwip/u-boot/lwipopts.h create mode 100644 net-lwip/Kconfig create mode 100644 net-lwip/Makefile create mode 100644 net-lwip/dhcp.c create mode 100644 net-lwip/dns.c create mode 100644 net-lwip/eth_internal.h create mode 100644 net-lwip/net-lwip.c create mode 100644 net-lwip/ping.c create mode 100644 net-lwip/tftp.c create mode 100644 net-lwip/wget.c -- 2.40.1

10 52

[PATCH] net/tftp: make tftpput working with servers that do not use OACK
by Mikhail Kshevetskiy 01 Jul '24

01 Jul '24

Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy(a)iopsys.eu> --- net/tftp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net/tftp.c b/net/tftp.c index 2e335413492..2534dec1c9f 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -494,8 +494,15 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, tftp_prev_block = tftp_cur_block; tftp_cur_block = (unsigned short)(block + 1); update_block_number(); - if (ack_ok) + if (ack_ok) { + if (block == 0 && + tftp_state == STATE_SEND_WRQ){ + /* connection's first ACK */ + tftp_state = STATE_DATA; + tftp_remote_port = src; + } tftp_send(); /* Send next data block */ + } } } #endif -- 2.43.0

2 1

[PATCH v4 0/2] k3-am625-beagleplay: Add symlinks for tiboot3 and tispl
by Dhruva Gole 01 Jul '24

01 Jul '24

Add symlinks for both tiboot3.bin and tispl.bin because a user has to anyway rename these files to get the platform to boot up. Also update the documentation to reflect above change. Changes in v4: * Add the docs patch. Cc: Nishant Menon <nm(a)ti.com> Cc: Robert Nelson <robertcnelson(a)gmail.com> Dhruva Gole (2): arm: dts: k3-am625-beagleplay: Add symlinks for tiboot3 and tispl doc: beagle: am62x_beagleplay: Rename the boot bins arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 1 + arch/arm/dts/k3-am625-r5-beagleplay.dts | 1 + doc/board/beagle/am62x_beagleplay.rst | 7 +++---- 3 files changed, 5 insertions(+), 4 deletions(-) base-commit: 16324b43db3f2b4fbbc3b701893fcfc4104f33fb -- 2.34.1

4 6

[PATCH 1/1] defconfig: disable VIDEO_COPY on the sandbox
by Heinrich Schuchardt 01 Jul '24

01 Jul '24

Since commit a75cf70d23ac ("efi: Correct handling of frame buffer") the EFI block image transfer is broken on the sandbox. To test build sandbox_defconfig with CONFIG_EFI_SELFTEST=y and execute setenv efi_selftest block image transfer bootefi selftest Fixes: a75cf70d23ac ("efi: Correct handling of frame buffer") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- configs/sandbox_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 93b52f2de5c..80c310b8e82 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -318,7 +318,6 @@ CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_VIDEO=y CONFIG_VIDEO_FONT_SUN12X22=y -CONFIG_VIDEO_COPY=y CONFIG_CONSOLE_ROTATION=y CONFIG_CONSOLE_TRUETYPE=y CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y -- 2.43.0

3 2

[PATCH] buildman: Add flag to filter out missing binary blobs
by Tom Rini 01 Jul '24

01 Jul '24

When doing builds of a number of platforms and not intending to run the resulting binaries, we have an option already to tell buildman to just make fake binaries for linking only. Add another option to filter this from the output, to make parsing build logs easier. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Cc: Simon Glass <sjg(a)chromium.org> --- tools/buildman/builder.py | 13 ++++++++++++- tools/buildman/cmdline.py | 3 +++ tools/buildman/control.py | 3 ++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index f35175b4598d..d72dbc3e8bfb 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -368,6 +368,9 @@ class Builder: self._re_note = re.compile('(.*):(\d*):(\d*): note: this is the location of the previous.*') self._re_migration_warning = re.compile(r'^={21} WARNING ={22}\n.*\n=+\n', re.MULTILINE | re.DOTALL) + self._re_missing_blobs = re.compile(r'Image.*is missing.*blobs.*\n.*\nSome images are invalid', + re.MULTILINE | re.DOTALL) + self.thread_exceptions = [] self.test_thread_exceptions = test_thread_exceptions @@ -409,7 +412,8 @@ class Builder: show_detail=False, show_bloat=False, list_error_boards=False, show_config=False, show_environment=False, filter_dtb_warnings=False, - filter_migration_warnings=False, ide=False): + filter_migration_warnings=False, + filter_missing_blobs=False, ide=False): """Setup display options for the builder. Args: @@ -424,6 +428,8 @@ class Builder: compiler filter_migration_warnings: Filter out any warnings about migrating a board to driver model + filter_missing_blobs: Filter out any warnings about missing binary + blobs ide: Create output that can be parsed by an IDE. There is no '+' prefix on error lines and output on stderr stays on stderr. """ @@ -436,6 +442,7 @@ class Builder: self._show_environment = show_environment self._filter_dtb_warnings = filter_dtb_warnings self._filter_migration_warnings = filter_migration_warnings + self._filter_missing_blobs = filter_missing_blobs self._ide = ide def _add_timestamp(self): @@ -672,6 +679,10 @@ class Builder: text = '\n'.join(lines) text = self._re_migration_warning.sub('', text) lines = text.splitlines() + if self._filter_missing_blobs: + text = '\n'.join(lines) + text = self._re_missing_blobs.sub('', text) + lines = text.splitlines() for line in lines: if self.re_make_err.search(line): continue diff --git a/tools/buildman/cmdline.py b/tools/buildman/cmdline.py index 03211bd5aa5f..6e5263b40747 100644 --- a/tools/buildman/cmdline.py +++ b/tools/buildman/cmdline.py @@ -168,6 +168,9 @@ def add_after_m(parser): parser.add_argument('-Y', '--filter-migration-warnings', action='store_true', default=False, help='Filter out migration warnings from output') + parser.add_argument('--filter-missing-blobs', action='store_true', + default=False, + help='Filter out missing binary blob warnings from output') def parse_args(): diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 8f6850c52113..cd6c47bd2993 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -539,7 +539,8 @@ def run_builder(builder, commits, board_selected, args): builder.set_display_options( args.show_errors, args.show_sizes, args.show_detail, args.show_bloat, args.list_error_boards, args.show_config, args.show_environment, - args.filter_dtb_warnings, args.filter_migration_warnings, args.ide) + args.filter_dtb_warnings, args.filter_migration_warnings, + args.filter_missing_blobs, args.ide) if args.summary: builder.show_summary(commits, board_selected) else: -- 2.34.1

2 1

[PATCH v2] spl: fit: List DTOs applied by SPL in U-Boot control DT
by Marek Vasut 01 Jul '24

01 Jul '24

Insert /u-boot,spl-applied-dto-<dto-name> = <index> property into the U-Boot control DT during SPL DTO application process. This can be used by user to inspect which DTOs got applied by the SPL and in which order from running U-Boot. Example: ``` u-boot=> fdt addr $fdtcontroladdr && fdt list / Working FDT set to aee9aeb0 / { u-boot,spl-applied-dto-fdt-dto-imx8mp-dhcom-pdk3-overlay-rev100 = <0x00000005>; u-boot,spl-applied-dto-fdt-dto-imx8mp-dhcom-som-overlay-rev100 = <0x00000004>; u-boot,spl-applied-dto-fdt-dto-imx8mp-dhcom-pdk-overlay-eth2xfast = <0x00000003>; u-boot,spl-applied-dto-fdt-dto-imx8mp-dhcom-som-overlay-eth2xfast = <0x00000002>; ... ``` Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Manoj Sai <abbaraju.manojsai(a)amarulasolutions.com> Cc: Sean Anderson <seanga2(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Suniel Mahesh <sunil(a)amarulasolutions.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)dh-electronics.com Cc: u-boot(a)lists.denx.de --- V2: - Expand the DT by one more byte to cater for trailing NUL byte - Update comment related to the expansion of DT - Flip the !ret conditional, which was incorrect and missed - Expand prefix to u-boot,spl-applied-dto- - Document the binding --- common/spl/spl_fit.c | 29 +++++++++++++++++++++++++++-- doc/device-tree-bindings/config.txt | 11 +++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 988125be008..0a6b5ea8212 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -363,6 +363,7 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image, { struct spl_image_info image_info; int node, ret = 0, index = 0; + char dtoname[256]; /* * Use the address following the image as target address for the @@ -448,9 +449,13 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image, if (ret < 0) break; - /* Make room in FDT for changes from the overlay */ + /* + * Make room in FDT for changes from the overlay, + * the overlay name and the trailing NUL byte in + * that name. + */ ret = fdt_increase_size(spl_image->fdt_addr, - image_info.size); + image_info.size + strlen(str) + 1); if (ret < 0) break; @@ -464,6 +469,26 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image, debug("%s: DT overlay %s applied\n", __func__, fit_get_name(ctx->fit, node, NULL)); + + /* + * Insert /u-boot,<dto-name> = <index> property into + * the U-Boot control DT. This can be used by user + * to inspect which DTOs got applied by the SPL from + * a running U-Boot. + */ + snprintf(dtoname, sizeof(dtoname), "u-boot,spl-applied-dto-%s", str); + ret = fdt_setprop_u32(spl_image->fdt_addr, 0, dtoname, + index); + if (ret) { + /* + * The DTO itself was applied, do not treat the + * insertion of /u-boot,<dto-name> as an error + * so the system can possibly boot somehow. + */ + debug("%s: DT overlay %s name not inserted into / node (%d)\n", + __func__, + fit_get_name(ctx->fit, node, NULL), ret); + } } free(tmpbuffer); if (ret) diff --git a/doc/device-tree-bindings/config.txt b/doc/device-tree-bindings/config.txt index f50c68bbdc3..7aa6d9a72c6 100644 --- a/doc/device-tree-bindings/config.txt +++ b/doc/device-tree-bindings/config.txt @@ -95,6 +95,17 @@ rootdisk-offset (int) silent-console (int) If present and non-zero, the console is silenced by default on boot. +u-boot,spl-applied-dto-* (int) + Emitted by SPL into U-Boot control DT root node in case a DTO from + fitImage was applied on top of U-Boot control DT by the SPL fitImage + loader. The single integer cell indicates in which order was the DTO + applied by the SPL and matches the index of the DTO in the fitImage. + DTOs in fitImage may be skipped using board_spl_fit_append_fdt_skip(), + therefore the integers might not be monotonically incrementing, there + may be gaps. This property can be used to determine which DTOs were + applied by the SPL from running U-Boot by inspecting the U-Boot + control DT. + u-boot,spl-payload-offset (int) If present (and SPL is controlled by the device-tree), this allows to override the CONFIG_SYS_SPI_U_BOOT_OFFS setting using a value -- 2.43.0

2 3