June 2023 - U-Boot

[PATCH] spl: spl_fit: add weak prototype for fpga_load
by Eugen Hristev 09 Jun '23

09 Jun '23

In case OPTIMIZE_DEBUG is set, unused code will not be optimized out, hence the reference to fpga_load will be compiled. if DM_FPGA and SPL_FPGA are not set, the build will fail with : aarch64-none-linux-gnu-ld.bfd: common/spl/spl_fit.o: in function `spl_fit_upload_fpga': u-boot/common/spl/spl_fit.c:595: undefined reference to `fpga_load' By adding a weak prototype, build is successful. Signed-off-by: Eugen Hristev <eugen.hristev(a)collabora.com> --- common/spl/spl_fit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index c51482b3b659..ca2e337b1ec4 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -570,6 +570,12 @@ static void warn_deprecated(const char *msg) printf("\tSee doc/uImage.FIT/source_file_format.txt\n"); } +__weak int fpga_load(int devnum, const void *buf, size_t bsize, + bitstream_type bstype, int flags) +{ + return 0; +} + static int spl_fit_upload_fpga(struct spl_fit_info *ctx, int node, struct spl_image_info *fpga_image) { -- 2.34.1

1 1

[PATCH] cmd: usb: Prevent reset in usb tree/info command
by Xavier Drudis Ferran 09 Jun '23

09 Jun '23

Add a check to avoid dommed (by null pointer dereference) recursive call, not only for UCLASS_BLK. When booting my Rock Pi 4B+ with a USB mass storage stick plugged into one of the USB 2 ports (EHCI), when it is plugged before power on, when issuing a usb tree or usb info command I get a "Synchronous Error" and a reset just after printing the mass storage device in the usb tree or usb info. It might depend on the contents of the USB stick too, I'm not sure. It seems like I have two devices as children of the mass storage device. When there's only a UCLASS_BLK it works fine, but when there's a UCLASS_BLK and a UCLASS_BOOTDEV, it recurses with a null udev as first parameter and fails. Likewise for usb_show_info(). Not sure if this should be a patch, an RFC or a bug report. There may be a better way to solve this, I haven't researched commit 201417d700a2ab09 ("bootstd: Add the bootdev uclass") and bootdev flow properly, or thought about cases where udev is not null but the recursive call might need preventing too. Feel free to think it over before merging (or after). But this at least fixes a reset at an innocent looking usb tree or usb info command. Maybe we can improve it later? Cc: Simon Glass <sjg(a)chromium.org> Cc: Lukasz Majewski <lukma(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> Signed-off-by: Xavier Drudis Ferran <xdrudis(a)tinet.cat> --- cmd/usb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/usb.c b/cmd/usb.c index 73addb04c4..7e6065aa51 100644 --- a/cmd/usb.c +++ b/cmd/usb.c @@ -421,7 +421,8 @@ static void usb_show_tree_graph(struct usb_device *dev, char *pre) * Ignore emulators and block child devices, we only want * real devices */ - if ((device_get_uclass_id(child) != UCLASS_USB_EMUL) && + if (udev && + (device_get_uclass_id(child) != UCLASS_USB_EMUL) && (device_get_uclass_id(child) != UCLASS_BLK)) { usb_show_tree_graph(udev, pre); pre[index] = 0; @@ -607,7 +608,8 @@ static void usb_show_info(struct usb_device *udev) (device_get_uclass_id(child) != UCLASS_USB_EMUL) && (device_get_uclass_id(child) != UCLASS_BLK)) { udev = dev_get_parent_priv(child); - usb_show_info(udev); + if (udev) + usb_show_info(udev); } } } -- 2.20.1

2 3

[PATCH v2] usb: musb-new: sunxi: remove unused define
by Sam Edwards 08 Jun '23

08 Jun '23

This is a remnant from when the USB controller driver managed the reset signal itself. A patch from the very end of 2018 changed this driver to delegate reset (and clock) management to the proper control unit driver, but left this unused define behind. Signed-off-by: Sam Edwards <CFSworks(a)gmail.com> Reviewed-by: Marek Vasut <marex(a)denx.de> --- drivers/usb/musb-new/sunxi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c index 2b954601a0..85d815ad75 100644 --- a/drivers/usb/musb-new/sunxi.c +++ b/drivers/usb/musb-new/sunxi.c @@ -81,8 +81,6 @@ * From usbc/usbc.c ******************************************************************************/ -#define OFF_SUN6I_AHB_RESET0 0x2c0 - struct sunxi_musb_config { struct musb_hdrc_config *config; bool has_sram; -- 2.39.2

2 1

[PATCH v5 0/7] Tegra: add ASUS/Google Nexus 7 (2012) support
by Svyatoslav Ryhel 08 Jun '23

08 Jun '23

This patchset adds support for native use of U-Boot on: - ASUS T30 Transformers (7 devices, all models); - ASUS/Google Nexus 7 (2012), both grouper and tilapia - LG Optimus 4X HD (P880) and Optimus Vu (P895) - HTC One X (endeavoru) as a replacement for the vendor bootloader. Current commits are designed to work on re-crypted devices but can be used on clean unmodified devices with slight restrictions (like no booting/mounting emmc and no self updating feature). All device setup commits fall under the same pattern. Alongside device bringup tegra requires few small patches: - add gpio keyboard as stdin device - make networking boot options optional - add a small tool to generate SoC UID Commits passed ./tools/buildman/buildman tegra Building current source for 30 boards (12 threads, 1 job per thread) 30 0 0 /30 0:00:06 : apalis_t30 Completed: 30 total built, 30 newly), duration 0:05:23, rate 0.09 --- Changes from v4: - fixed documentation - fixed CONFIG_* definitions Changes from v3: - extended amount of devices supported Changes from v2: - fuse build is excluded for T186 (it is not supported in it anyway) Changes from v1: - fix fuse headers for newer Tegra generations - allow grouper_common_defconfig to pass without fragments --- Jonas Schwöbel (1): configs: tegra-common-post: make PXE and DHCP boot targets optional Svyatoslav Ryhel (6): configs: tegra-common-post: add GPIO keyboard as STDIN device ARM: tegra: add SoC UID calculation function board: asus: transformer: add ASUS Transformer T30 family support board: asus: grouper: add Google Nexus 7 (2012) support board: lg: x3: add Optimus 4X HD and Optimus Vu support board: htc: endeavoru: add One X support arch/arm/dts/Makefile | 12 + arch/arm/dts/tegra30-asus-grouper-common.dtsi | 157 ++++++ .../dts/tegra30-asus-nexus7-grouper-E1565.dts | 43 ++ .../dts/tegra30-asus-nexus7-grouper-PM269.dts | 36 ++ .../dts/tegra30-asus-nexus7-tilapia-E1565.dts | 62 +++ arch/arm/dts/tegra30-asus-p1801-t.dts | 17 + arch/arm/dts/tegra30-asus-tf201.dts | 9 + arch/arm/dts/tegra30-asus-tf300t.dts | 18 + arch/arm/dts/tegra30-asus-tf300tg.dts | 9 + arch/arm/dts/tegra30-asus-tf300tl.dts | 9 + arch/arm/dts/tegra30-asus-tf600t.dts | 89 ++++ arch/arm/dts/tegra30-asus-tf700t.dts | 13 + arch/arm/dts/tegra30-asus-transformer.dtsi | 211 ++++++++ arch/arm/dts/tegra30-htc-endeavoru.dts | 166 +++++++ arch/arm/dts/tegra30-lg-p880.dts | 40 ++ arch/arm/dts/tegra30-lg-p895.dts | 50 ++ arch/arm/dts/tegra30-lg-x3.dtsi | 180 +++++++ arch/arm/include/asm/arch-tegra/fuse.h | 7 + arch/arm/mach-tegra/Makefile | 4 + arch/arm/mach-tegra/fuse.c | 151 ++++++ arch/arm/mach-tegra/tegra30/Kconfig | 20 + board/asus/grouper/Kconfig | 22 + board/asus/grouper/MAINTAINERS | 6 + board/asus/grouper/Makefile | 14 + board/asus/grouper/grouper-spl-max.c | 45 ++ board/asus/grouper/grouper-spl-ti.c | 41 ++ board/asus/grouper/grouper.c | 202 ++++++++ board/asus/grouper/pinmux-config-grouper.h | 362 ++++++++++++++ board/asus/transformer-t30/Kconfig | 23 + board/asus/transformer-t30/MAINTAINERS | 6 + board/asus/transformer-t30/Makefile | 11 + .../pinmux-config-transformer.h | 365 ++++++++++++++ .../transformer-t30/transformer-t30-spl.c | 41 ++ board/asus/transformer-t30/transformer-t30.c | 201 ++++++++ board/htc/endeavoru/Kconfig | 12 + board/htc/endeavoru/MAINTAINERS | 6 + board/htc/endeavoru/Makefile | 11 + board/htc/endeavoru/endeavoru-spl.c | 47 ++ board/htc/endeavoru/endeavoru.c | 116 +++++ board/htc/endeavoru/pinmux-config-endeavoru.h | 362 ++++++++++++++ board/lg/x3-t30/Kconfig | 26 + board/lg/x3-t30/MAINTAINERS | 6 + board/lg/x3-t30/Makefile | 11 + board/lg/x3-t30/pinmux-config-x3.h | 449 ++++++++++++++++++ board/lg/x3-t30/x3-t30-spl.c | 48 ++ board/lg/x3-t30/x3-t30.c | 176 +++++++ configs/endeavoru_defconfig | 84 ++++ configs/grouper_E1565.config | 2 + configs/grouper_PM269.config | 2 + configs/grouper_common_defconfig | 84 ++++ configs/p1801-t.config | 2 + configs/p880.config | 4 + configs/p895.config | 4 + configs/tf201.config | 2 + configs/tf300t.config | 2 + configs/tf300tg.config | 2 + configs/tf300tl.config | 2 + configs/tf600t.config | 4 + configs/tf700t.config | 2 + configs/tilapia.config | 3 + configs/transformer_t30_defconfig | 85 ++++ configs/x3_t30_defconfig | 88 ++++ doc/board/asus/grouper_common.rst | 95 ++++ doc/board/asus/index.rst | 10 + doc/board/asus/transformer_t30.rst | 96 ++++ doc/board/htc/endeavoru.rst | 90 ++++ doc/board/htc/index.rst | 9 + doc/board/lg/index.rst | 9 + doc/board/lg/x3_t30.rst | 93 ++++ include/configs/endeavoru.h | 65 +++ include/configs/grouper.h | 61 +++ include/configs/tegra-common-post.h | 28 +- include/configs/transformer-common.h | 94 ++++ include/configs/transformer-t30.h | 23 + include/configs/x3-t30.h | 77 +++ 75 files changed, 5029 insertions(+), 5 deletions(-) create mode 100644 arch/arm/dts/tegra30-asus-grouper-common.dtsi create mode 100644 arch/arm/dts/tegra30-asus-nexus7-grouper-E1565.dts create mode 100644 arch/arm/dts/tegra30-asus-nexus7-grouper-PM269.dts create mode 100644 arch/arm/dts/tegra30-asus-nexus7-tilapia-E1565.dts create mode 100644 arch/arm/dts/tegra30-asus-p1801-t.dts create mode 100644 arch/arm/dts/tegra30-asus-tf201.dts create mode 100644 arch/arm/dts/tegra30-asus-tf300t.dts create mode 100644 arch/arm/dts/tegra30-asus-tf300tg.dts create mode 100644 arch/arm/dts/tegra30-asus-tf300tl.dts create mode 100644 arch/arm/dts/tegra30-asus-tf600t.dts create mode 100644 arch/arm/dts/tegra30-asus-tf700t.dts create mode 100644 arch/arm/dts/tegra30-asus-transformer.dtsi create mode 100644 arch/arm/dts/tegra30-htc-endeavoru.dts create mode 100644 arch/arm/dts/tegra30-lg-p880.dts create mode 100644 arch/arm/dts/tegra30-lg-p895.dts create mode 100644 arch/arm/dts/tegra30-lg-x3.dtsi create mode 100644 arch/arm/mach-tegra/fuse.c create mode 100644 board/asus/grouper/Kconfig create mode 100644 board/asus/grouper/MAINTAINERS create mode 100644 board/asus/grouper/Makefile create mode 100644 board/asus/grouper/grouper-spl-max.c create mode 100644 board/asus/grouper/grouper-spl-ti.c create mode 100644 board/asus/grouper/grouper.c create mode 100644 board/asus/grouper/pinmux-config-grouper.h create mode 100644 board/asus/transformer-t30/Kconfig create mode 100644 board/asus/transformer-t30/MAINTAINERS create mode 100644 board/asus/transformer-t30/Makefile create mode 100644 board/asus/transformer-t30/pinmux-config-transformer.h create mode 100644 board/asus/transformer-t30/transformer-t30-spl.c create mode 100644 board/asus/transformer-t30/transformer-t30.c create mode 100644 board/htc/endeavoru/Kconfig create mode 100644 board/htc/endeavoru/MAINTAINERS create mode 100644 board/htc/endeavoru/Makefile create mode 100644 board/htc/endeavoru/endeavoru-spl.c create mode 100644 board/htc/endeavoru/endeavoru.c create mode 100644 board/htc/endeavoru/pinmux-config-endeavoru.h create mode 100644 board/lg/x3-t30/Kconfig create mode 100644 board/lg/x3-t30/MAINTAINERS create mode 100644 board/lg/x3-t30/Makefile create mode 100644 board/lg/x3-t30/pinmux-config-x3.h create mode 100644 board/lg/x3-t30/x3-t30-spl.c create mode 100644 board/lg/x3-t30/x3-t30.c create mode 100644 configs/endeavoru_defconfig create mode 100644 configs/grouper_E1565.config create mode 100644 configs/grouper_PM269.config create mode 100644 configs/grouper_common_defconfig create mode 100644 configs/p1801-t.config create mode 100644 configs/p880.config create mode 100644 configs/p895.config create mode 100644 configs/tf201.config create mode 100644 configs/tf300t.config create mode 100644 configs/tf300tg.config create mode 100644 configs/tf300tl.config create mode 100644 configs/tf600t.config create mode 100644 configs/tf700t.config create mode 100644 configs/tilapia.config create mode 100644 configs/transformer_t30_defconfig create mode 100644 configs/x3_t30_defconfig create mode 100644 doc/board/asus/grouper_common.rst create mode 100644 doc/board/asus/index.rst create mode 100644 doc/board/asus/transformer_t30.rst create mode 100644 doc/board/htc/endeavoru.rst create mode 100644 doc/board/htc/index.rst create mode 100644 doc/board/lg/index.rst create mode 100644 doc/board/lg/x3_t30.rst create mode 100644 include/configs/endeavoru.h create mode 100644 include/configs/grouper.h create mode 100644 include/configs/transformer-common.h create mode 100644 include/configs/transformer-t30.h create mode 100644 include/configs/x3-t30.h -- 2.39.2

2 17

[PATCH] usb: musb-new: sunxi: remove unused define
by Sam Edwards 08 Jun '23

08 Jun '23

Signed-off-by: Sam Edwards <CFSworks(a)gmail.com> --- drivers/usb/musb-new/sunxi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c index 2b954601a0..85d815ad75 100644 --- a/drivers/usb/musb-new/sunxi.c +++ b/drivers/usb/musb-new/sunxi.c @@ -81,8 +81,6 @@ * From usbc/usbc.c ******************************************************************************/ -#define OFF_SUN6I_AHB_RESET0 0x2c0 - struct sunxi_musb_config { struct musb_hdrc_config *config; bool has_sram; -- 2.39.2

2 2

[RFC PATCH v9 00/23] Modernize U-Boot shell
by Francis Laniel 08 Jun '23

08 Jun '23

Hi. During 2021 summer, Sean Anderson wrote a contribution to add a new shell, based on LIL, to U-Boot [1, 2]. While one of the goals of this contribution was to address the fact actual U-Boot shell, which is based on Busybox hush, is old there was a discussion about adding a new shell versus updating the actual one [3, 4]. So, in this series, with Harald Seiler, we updated the actual U-Boot shell to reflect what is currently in Busybox source code. Basically, this contribution is about taking a snapshot of Busybox shell/hush.c file (as it exists in commit 37460f5da) and adapt it to suit U-Boot needs. This contribution was written to be as backward-compatible as possible to avoid breaking the existing. So, the 2021 hush flavor offers the same as the actual, that is to say: 1. Variable expansion. 2. Instruction lists (;, && and ||). 3. If, then and else. 4. Loops (for, while and until). No new features offered by Busybox hush were implemented (e.g. functions). It is possible to change the parser at runtime using the "cli" command: => cli print old => cli set 2021 => cli print 2021 => cli set old The default parser is the old one. Note that to use both parser, you would need to set both CONFIG_HUSH_2021_PARSER and CONFIG_HUSH_OLD_PARSER. In terms of testing, new unit tests were added to ut to ensure the new behavior is the same as the old one and it does not add regression. Nonetheless, if old behavior was buggy and fixed upstream, the fix is then added to U-Boot [5]. In sandbox, all of these tests pass smoothly: => printenv board board=sandbox => ut hush Running 20 hush tests ... Failures: 0 => parser set 2021 => ut hush Running 20 hush tests ... Failures: 0 Thanks to the effort of Harald Seiler, I was successful booting a board: => printenv fdtfile fdtfile=amlogic/meson-gxl-s905x-libretech-cc.dtb => cli get old => boot ... root@lepotato:~# root@lepotato:~# reboot ... => cli set 2021 => cli get 2021 => printenv fdtfile fdtfile=amlogic/meson-gxl-s905x-libretech-cc.dtb => boot ... root@lepotato:~# I was able to have the CI passes but I had to not use CONFIG_HUSH_2021_PARSER for the keymile board. Indeed, the keymile board family is the only set of boards to call get_local_var(), set_local_var() and unset_local_var(). Sadly, these functions are static in this contribution. I could have change all of them to introduce code like this: *_local_var(/*...*/) { if (gd->flags & GD_FLG_HUSH_OLD_PARSER) return *_local_var_old(/*...*/); if (gd->flags & GD_FLG_HUSH_2021_PARSER) return *_local_var_2021(/*...*/); } But this would have mean renaming all old hush functions calls and I did not want to change the old hush particularly to avoid breaking things. Instead, I change the keymile board to use environment variable instead of local ones. I think this particularities can be addressed in future works. I also had to enable CONFIG_LTO for kirkwoord sheevaplug and phytec bk4r1, so they do not hit their limits. For all these reasons, I marked this contribution as RFC to indeed collect your opinions. My goal is not to change suddenly actual shell to this one, we clearly need a transition period to think about it. I think it is better to see this contribution as a proof of concept which shows it is possible to update the actual shell. If you want to review it - your review will really be appreciated - here are some information regarding the commits: * commits marked as "test:" deal with unit tests. * commit "cli: Add Busybox upstream hush.c file." copies Busybox shell/hush.c into U-Boot tree, this explain why this commit contains around 12000 additions. * commit "cli: Port Busybox 2021 hush to U-Boot." modifies previously added file to permit us to use this as new shell. The really good idea of #include'ing Busybox code into a wrapper file to define some particular functions while minimizing modifications to upstream code comes from Harald Seiler. * commit "cmd: Add new parser command" adds a new command which permits selecting parser at runtime. I am not really satisfied with the fact it calls cli_init() and cli_loop() each time the parser is set, so your reviews would be welcomed. * Other commits focus on enabling features we need (e.g. if). Changes since: v2: * Added a small fix to compile sandbox with NO_SDL=1. * Added a command to change parser at runtime. * Added 2021 parser function to all run_command*(). v3: * Various bug fixes pointed by the CI. * Added upstream busybox hush commits until 6th February 2022. v4: * Various cleaning. * Modified python test to accept failure output when the test are designed to fail. * Bumped upstream busybox hush commits until 24h March 2022. v5: * Bumped upstream busybox hush commits until 30th January 2023. * Fix how hush interprets '<' and '>', indeed we needed to escape them but I removed this behavior as tests are handled by test command and not hush itself. This permitted to have the ut fdt to pass. * Fix a problem with how exit was handled. This was reported by the ut exit test. v6: * There was no v6 and I got mixed up with version. v7: * Bumped upstream busybox hush commits until 9th May 2023. * Renamed parser command to change parser at runtime to cli and added documentation. * Added better separation of patches. * Removed code about __gnu_thumb1_case_si as it was merged in another series. * Various cleaning. v8: * Bumped upstream busybox hush commits until 25th May 2023. Francis Laniel (23): test: Add framework to test hush behavior test: hush: Test hush if/else test/py: hush_if_test: Remove the test file test: hush: Test hush variable expansion test: hush: Test hush commands list test: hush: Test hush loops cli: Add Busybox upstream hush.c file cli: Port Busybox 2021 hush to U-Boot cli: Add menu for hush parser global_data.h: add GD_FLG_HUSH_OLD_PARSER flag cmd: Add new cli command cli: Enables using hush 2021 parser as command line parser cli: hush_2021: Enable variables expansion for hush 2021 cli: hush_2021: Add functions to be called from run_command() cli: add hush 2021 as parser for run_command*() test: hush: Fix instructions list tests for hush 2021 test: hush: Fix variable expansion tests for hush 2021 cli: hush_2021: Enable using < and > as string compare operators cli: hush_2021: Enable if keyword cli: hush_2021: Enable loops test: hush: Fix loop tests for hush 2021 cli: hush_2021: Add upstream commits up to 25th May 2023. DO NOT MERGE: only to make CI happy cmd/Kconfig | 22 + cmd/Makefile | 2 + cmd/cli.c | 125 + common/Makefile | 3 +- common/cli.c | 82 +- common/cli_hush_2021.c | 306 + common/cli_hush_upstream.c | 13036 +++++++++++++++++++++++++++ configs/sheevaplug_defconfig | 1 + doc/usage/cmd/cli.rst | 74 + doc/usage/index.rst | 1 + include/asm-generic/global_data.h | 8 + include/cli_hush.h | 51 +- include/test/hush.h | 15 + include/test/suites.h | 1 + test/Makefile | 3 + test/cmd_ut.c | 6 + test/hush/Makefile | 10 + test/hush/cmd_ut_hush.c | 20 + test/hush/dollar.c | 226 + test/hush/if.c | 316 + test/hush/list.c | 140 + test/hush/loop.c | 91 + test/py/tests/test_hush_if_test.py | 197 - test/py/tests/test_ut.py | 8 +- tools/patman/series.py | 4 + 25 files changed, 14536 insertions(+), 212 deletions(-) create mode 100644 cmd/cli.c create mode 100644 common/cli_hush_2021.c create mode 100644 common/cli_hush_upstream.c create mode 100644 doc/usage/cmd/cli.rst create mode 100644 include/test/hush.h create mode 100644 test/hush/Makefile create mode 100644 test/hush/cmd_ut_hush.c create mode 100644 test/hush/dollar.c create mode 100644 test/hush/if.c create mode 100644 test/hush/list.c create mode 100644 test/hush/loop.c delete mode 100644 test/py/tests/test_hush_if_test.py Best regards and thank you in advance. --- [1] https://lists.denx.de/pipermail/u-boot/2021-July/453347.html [2] https://runtimeterror.com/tech/lil/ [3] https://lists.denx.de/pipermail/u-boot/2021-July/453790.html [4] https://lists.denx.de/pipermail/u-boot/2021-July/453848.html [5] https://lists.denx.de/pipermail/u-boot/2021-August/458569.html -- 2.34.1

1 23

[u-boot/next] Pull request efi-next-20230608
by Heinrich Schuchardt 08 Jun '23

08 Jun '23

Dear Tom, The following changes since commit ac6096fe9c4d99f1dc37db95f213e08a48b11e70: Merge branch '2023-06-01-assorted-platform-updates' into next (2023-06-01 15:43:38 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-next-20230608 for you to fetch changes up to b6f954e5b09545d18a150e4a4431a648e41ff287: test/py: efi_capsule: test for FMP versioning (2023-06-08 09:20:36 +0200) Gitlab CI showed no issues: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/16516 ---------------------------------------------------------------- Pull request efi-next-20230608 UEFI: * Support for firmware versions in capsule updates ---------------------------------------------------------------- Masahisa Kojima (10): efi_loader: add the number of image entries in efi_capsule_update_info efi_loader: store firmware version into FmpState variable efi_loader: versioning support in GetImageInfo efi_loader: get lowest supported version from device tree efi_loader: check lowest supported version mkeficapsule: add FMP Payload Header doc: uefi: add firmware versioning documentation doc: uefi: add anti-rollback documentation test: efi_capsule: refactor efi_capsule test test/py: efi_capsule: test for FMP versioning arch/arm/mach-rockchip/board.c | 4 +- .../advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 2 +- .../imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c | 2 +- board/emulation/qemu-arm/qemu-arm.c | 2 +- board/kontron/pitx_imx8m/pitx_imx8m.c | 2 +- board/kontron/sl-mx8mm/sl-mx8mm.c | 2 +- board/kontron/sl28/sl28.c | 2 +- board/rockchip/evb_rk3399/evb-rk3399.c | 2 +- board/sandbox/sandbox.c | 2 +- board/socionext/developerbox/developerbox.c | 2 +- board/st/stm32mp1/stm32mp1.c | 2 +- board/xilinx/common/board.c | 2 +- doc/develop/uefi/uefi.rst | 66 +++++ .../firmware/firmware-version.txt | 22 ++ doc/mkeficapsule.1 | 10 + include/efi_loader.h | 3 +- lib/efi_loader/efi_firmware.c | 276 +++++++++++++++++-- lib/fwu_updates/fwu.c | 2 +- test/py/tests/test_efi_capsule/capsule_common.py | 142 ++++++++++ test/py/tests/test_efi_capsule/conftest.py | 82 ++++++ .../test_efi_capsule/test_capsule_firmware_fit.py | 213 +++++++-------- .../test_efi_capsule/test_capsule_firmware_raw.py | 301 ++++++++------------- .../test_capsule_firmware_signed_fit.py | 269 +++++++----------- .../test_capsule_firmware_signed_raw.py | 276 ++++++++----------- test/py/tests/test_efi_capsule/version.dts | 24 ++ tools/eficapsule.h | 30 ++ tools/mkeficapsule.c | 37 ++- 27 files changed, 1102 insertions(+), 677 deletions(-) create mode 100644 doc/device-tree-bindings/firmware/firmware-version.txt create mode 100644 test/py/tests/test_efi_capsule/capsule_common.py create mode 100644 test/py/tests/test_efi_capsule/version.dts

2 1

Pull request: u-boot-sunxi/master for 2023.07
by Andre Przywara 08 Jun '23

08 Jun '23

Hi Tom, a small late pull request for Allwinner. The main feature is just a DT update, matching the v6.4 Linux kernel DT files. This also enables a board (LCTech Pi F1C200s) which got its .dts file merged into Linux. Plus a tiny typo fix from Sam. Gitlab CI passed, briefly tested on an H616 board and the new LCTech Pi. Thanks, Andre ======================== The following changes since commit 0a8a4b86422650d6955a2382796089735453902d: Merge tag 'u-boot-amlogic-20230607' of https://source.denx.de/u-boot/custodians/u-boot-amlogic (2023-06-07 12:17:06 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-sunxi.git master for you to fetch changes up to 9bc6f1a4d08261032d60836ea1dd6f2e98889060: sunxi: Fix typo in include guard (2023-06-07 22:45:02 +0100) ---------------------------------------------------------------- Andre Przywara (2): sunxi: dts: arm/arm64: update devicetree files from Linux-v6.4-rc2 sunxi: defconfig: Add Lctech Pi F1C200s board Sam Edwards (1): sunxi: Fix typo in include guard arch/arm/dts/axp22x.dtsi | 6 +++ arch/arm/dts/axp809.dtsi | 7 +++ arch/arm/dts/axp81x.dtsi | 14 ----- arch/arm/dts/sun50i-a64.dtsi | 1 + arch/arm/dts/sun50i-h5-orangepi-pc2.dts | 1 + arch/arm/dts/sun5i-gr8-chip-pro.dts | 2 +- arch/arm/dts/sun5i-r8-chip.dts | 2 +- arch/arm/dts/sun6i-a31.dtsi | 12 ++--- arch/arm/dts/sun6i-a31s-sina31s.dts | 2 +- arch/arm/dts/sun8i-a23-a33.dtsi | 10 ++-- arch/arm/dts/sun8i-a33.dtsi | 1 + arch/arm/dts/sun8i-a83t-bananapi-m3.dts | 15 ++++++ arch/arm/dts/sun8i-h3-beelink-x2.dts | 2 +- arch/arm/dts/sun8i-h3-nanopi-duo2.dts | 2 +- arch/arm/dts/sun8i-v3s.dtsi | 6 +-- arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 16 ++++++ arch/arm/dts/suniv-f1c100s.dtsi | 32 +++++++++++ arch/arm/dts/suniv-f1c200s-lctech-pi.dts | 76 ++++++++++++++++++++++++++ arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts | 81 ++++++++++++++++++++++++++++ arch/arm/dts/sunxi-h3-h5.dtsi | 8 +-- arch/arm/include/asm/arch-sunxi/pmic_bus.h | 2 +- configs/lctech_pi_f1c200s_defconfig | 11 ++++ 22 files changed, 271 insertions(+), 38 deletions(-) create mode 100644 arch/arm/dts/suniv-f1c200s-lctech-pi.dts create mode 100644 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts create mode 100644 configs/lctech_pi_f1c200s_defconfig

2 1

Reading squashfs from spi nor mtd device
by Mike Looijmans 08 Jun '23

08 Jun '23

Been banging my head most of the day, can't figure it out. Have squashfs support compiled in, and can load files and so from MMC device. What I really want is to read (kernel etc) from a QSPI NOR flash (using mtd I guess?) For mmc it's easy: Zynq> sqfsls mmc 0:2 bin/ boot/ dev/ etc/ home/ lib/ <SYM> linuxrc media/ <SYM> mnt proc/ run/ sbin/ sys/ <SYM> tmp usr/ var/ www/ 3 file(s), 14 dir(s) For QSPI NOR, I can't find any clue as for what I should pass to sqfsls as "device" parameters. I have MTD set up, and I can load ubifs just fine from this flash, using "ubi part qspi-rootfs" when there's an ubi fileystem in there... Zynq> mtd list List of MTD devices: * nor0 - device: flash@0 - parent: spi@e000d000 - driver: jedec_spi_nor - path: /axi/spi@e000d000/flash@0 - type: NOR flash - block size: 0x10000 bytes - min I/O: 0x1 bytes - 0x000000000000-0x000002000000 : "nor0" - 0x000000000000-0x000000100000 : "qspi-boot-bin" - 0x000000100000-0x000002000000 : "qspi-rootfs" So what are the "magic" words I need to pass to sqfsload to make it read the flash device? -- Mike Looijmans System Expert TOPIC Embedded Products B.V. Materiaalweg 4, 5681 RJ Best The Netherlands T: +31 (0) 499 33 69 69 E: mike.looijmans(a)topic.nl W: www.topic.nl

1 0

[PATCH 0/8] Updats SPL splashscreen framework for AM62x
by Nikhil M Jain 08 Jun '23

08 Jun '23

This patch series aims at updating SPL splashscreen framework for AM62x. Nikhil M Jain (8): common: spl: spl: Update stack pointer address arch: arm: mach-k3: common: Return a pointer after setting page table board: ti: am62x: evm: Update function calls for splash screen include: video: Reserve video using blob common: board_f: Pass frame buffer info from SPL to u-boot drivers: video: Kconfig: Add config remove video common: spl: spl: Remove video driver configs: am62x_evm_a53: Add bloblist address arch/arm/mach-k3/am625_init.c | 1 + arch/arm/mach-k3/common.c | 2 ++ board/ti/am62x/evm.c | 46 +++++++++++++-------------------- common/board_f.c | 13 +++++++++- common/spl/spl.c | 3 ++- configs/am62x_evm_a53_defconfig | 1 + drivers/video/Kconfig | 12 +++++++++ drivers/video/video-uclass.c | 24 +++++++++++++++++ include/video.h | 9 +++++++ 9 files changed, 81 insertions(+), 30 deletions(-) -- 2.34.1

3 24