January 2023 - U-Boot

[PULL] u-boot-usb/master
by Marek Vasut 15 Jan '23

15 Jan '23

The following changes since commit fe4c21de4fbf5756d354d2473ffc675e7596ccfb: Merge tag 'u-boot-stm32-20230113' of https://source.denx.de/u-boot/custodians/u-boot-stm (2023-01-13 09:56:19 -0500) are available in the Git repository at: git://source.denx.de/u-boot-usb.git master for you to fetch changes up to 2383e8f4aec7a5087526d501478c4ba8235da2b4: usb: gadget: dwc2_udc_otg: implement pullup() (2023-01-14 14:10:30 +0100) ---------------------------------------------------------------- Dario Binacchi (1): usb: gadget: fastboot: detach usb just before rebooting Mattijs Korpershoek (1): usb: gadget: dwc2_udc_otg: implement pullup() Patrick Delaunay (1): usb: hub: allow to increase HUB_DEBOUNCE_TIMEOUT common/Kconfig | 12 ++++++++++++ common/usb_hub.c | 2 +- drivers/usb/gadget/dwc2_udc_otg.c | 9 +++++++++ drivers/usb/gadget/f_fastboot.c | 2 +- 4 files changed, 23 insertions(+), 2 deletions(-)

2 1

v2023.01: u-boot-tools build failure
by Fabio Estevam 15 Jan '23

15 Jan '23

Hi, I am trying to upgrade U-Boot to 2023.01 in OpenEmbedded, but I see the following error when trying to build u-boot-tools: | /bin/sh: line 1: tools/bmp_logo: No such file or directory Reverting the commit below makes u-boot-tools build again: commit 1cfba53ca46cade2dbf4e067afc8c19e72909a4b Author: Peter Robinson <pbrobinson(a)gmail.com> Date: Thu Nov 24 14:05:59 2022 +0000 config: tools only: add VIDEO to build bmp_logo Pre 2023.01 the bmp_logo was built as part of the tools-only_defconfig build, something changed and the VIDEO dep needed to build it is no longer pulled in so fix that by explicitly defining it. Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> u-boot-tools-native builds fine though. What would be the correct way to fix this? Thanks, Fabio Estevam

3 3

SPL_FIT_GENERATOR series
by Simon Glass 15 Jan '23

15 Jan '23

Hi Kever, Do you think we could apply this series[1] ? I am happy to do this myself if you would like it to go through the driver model tree. Regards, Simon [1] https://patchwork.ozlabs.org/project/uboot/list/?series=335487

1 0

[PATCH v6 0/6] add support for Theobroma Systems PX30-µQ7 (Ringneck) with Haikou devkit
by Quentin Schulz 15 Jan '23

15 Jan '23

The PX30-uQ7 (Ringneck) SoM is a µQseven-compatible (40mmx70mm, MXM-230 connector) system-on-module from Theobroma Systems[1], featuring the Rockchip PX30. It provides the following feature set: * up to 4GB DDR4 * up to 128GB on-module eMMC (with 8-bit 1.8V interface) * SD card (on a baseboard) via edge connector * Fast Ethernet with on-module TI DP83825I PHY * MIPI-DSI/LVDS * MIPI-CSI * USB - 1x USB 2.0 dual-role - 3x USB 2.0 host * on-module companion controller (STM32 Cortex-M0 or ATtiny), implementing: - low-power RTC functionality (ISL1208 emulation) - fan controller (AMC6821 emulation) - USB<->CAN bridge controller (STM32 only) * on-module Espressif ESP32 for Bluetooth + 2.4GHz WiFi * on-module NXP SE05x Secure Element [1] https://www.theobroma-systems.com/som-product/px30-uq7/ Cheers, Quentin To: Heiko Stuebner <heiko(a)sntech.de> To: Simon Glass <sjg(a)chromium.org> To: Philipp Tomsich <philipp.tomsich(a)vrull.eu> To: Klaus Goger <klaus.goger(a)theobroma-systems.com> Cc: Quentin Schulz <foss+uboot(a)0leil.net> Cc: u-boot(a)lists.denx.de Cc: Kever Yang <kever.yang(a)rock-chips.com> Signed-off-by: Quentin Schulz <quentin.schulz(a)theobroma-systems.com> --- Changes in v6: - rebased on top of next, - added CONFIG_SYS_NS16550_MEM32 option to defconfig since the symbol was migrated to Kconfig recently in next, - s/CONFIG_IRAM_BASE/CFG_IRAM_BASE/ for the bootrom register address variable name, recently changed in next, - update reviewed-by, - Link to v5: https://lore.kernel.org/r/20221017-upstream-ringneck-v5-0-e7b3f342a662@theo… Changes in v5: - added fix for unused variables in px30.c, - fixed missing fdt_support.h inclusion in px30.c, - updated commit log to reference v6.1 and v6.2-rc2 sources for syncing of files instead of linux-next, - rebased on top of master, - Link to v4: https://lore.kernel.org/r/20221017-upstream-ringneck-v4-0-5e0a3f119047@theo… Changes in v4: - added CONFIG_ENV_OVERWRITE to defconfig to match Puma behavior and allow commands specified in our user manual, - added comment in commit log for the DTS origin (next-20221114), - Link to v3: https://lore.kernel.org/r/20221017-upstream-ringneck-v3-0-d6ae387f35ef@theo… Changes in v3: - added Rb, - rebased on top of master, - fixed http links to use u instead of encoded µ, - updated u-boot,mmc-env-offset from 16KB to 20KB to avoid GPT corruption when saving env + reduced env size to 0x3000 to adapt to the offset change, - removed video support from defconfig as there's no display support ATM, - Link to v2: https://lore.kernel.org/r/20221017-upstream-ringneck-v2-0-0f03912ebac2@theo… Changes in v2: - updated DTS from Linux with v2 of the Linux kernel patch series, - updated node nade for bios-disable-override-hog to match v2 of Linux kernel, - removed uapi input patch since it is not needed anymore, --- Quentin Schulz (6): rockchip: px30: fix possibly unused grf and cru variables rockchip: px30: fix CFG_IRAM_BASE rockchip: px30: list possible SPL boot devices rockchip: px30: insert u-boot,spl-boot-device into U-Boot device tree arm64: dts: rockchip: sync px30 DTSI with Linux kernel v6.1 rockchip: add support for PX30 Ringneck SoM on Haikou Devkit arch/arm/dts/px30-ringneck-haikou-u-boot.dtsi | 91 +++++ arch/arm/dts/px30-ringneck-haikou.dts | 232 +++++++++++++ arch/arm/dts/px30-ringneck.dtsi | 382 +++++++++++++++++++++ arch/arm/dts/px30.dtsi | 28 +- arch/arm/mach-rockchip/px30/Kconfig | 25 ++ arch/arm/mach-rockchip/px30/px30.c | 67 ++++ board/theobroma-systems/ringneck_px30/Kconfig | 18 + board/theobroma-systems/ringneck_px30/MAINTAINERS | 9 + board/theobroma-systems/ringneck_px30/Makefile | 7 + board/theobroma-systems/ringneck_px30/README | 69 ++++ .../ringneck_px30/ringneck-px30.c | 175 ++++++++++ configs/ringneck-px30_defconfig | 129 +++++++ doc/board/rockchip/rockchip.rst | 1 + include/configs/px30_common.h | 3 +- include/configs/ringneck_px30.h | 15 + 15 files changed, 1246 insertions(+), 5 deletions(-) --- base-commit: 50a76183eff0d53178d7df5db6b6b00a9f9ca357 change-id: 20221017-upstream-ringneck-57abd09a7aaa Best regards, -- Quentin Schulz <quentin.schulz(a)theobroma-systems.com>

2 7

[PATCHv2 0/1] Add ASPEED AST2600 I2C new controller driver
by ryan_chen 15 Jan '23

15 Jan '23

This series add AST2600 i2c new register set driver. The i2c new register set have new clock divider option for more flexiable generation. v2: add speed support desciption in Kconfig. modify include header ordering. separate include register define header. modify wording reserver to reserved. remove defined string AST2600. modify signle-line comment style. remove extra (). modify local regs for register ctrl. ryan_chen (1): i2c:aspeed:support ast2600 i2c new register mode driver MAINTAINERS | 6 + drivers/i2c/Kconfig | 10 + drivers/i2c/Makefile | 1 + drivers/i2c/ast2600_i2c.c | 375 ++++++++++++++++++++++++++++++++++++++ drivers/i2c/ast2600_i2c.h | 120 ++++++++++++ 5 files changed, 512 insertions(+) create mode 100644 drivers/i2c/ast2600_i2c.c create mode 100644 drivers/i2c/ast2600_i2c.h -- 2.34.1

3 3

kwboot: UART booting with bin_hdr u-boot (Marvell Armada 385)
by Tony Dinh 15 Jan '23

15 Jan '23

Hi Pali, I'm building a new u-boot for the Thecus N2350 board (Armada 385 dual-core 1Ghz 1GB DDR4). The trouble with this board is DDR4, which is not currently supported in u-boot (also cc this to Chris for commenting about Marvell DDR4 training driver). So I'm building with binary.0 in the ./board/thecus/n2350/. This binary.0 is a copy of the Marvell bin_hdr for SPI in the GPL source for this board (provided by Thecus). My ./board/thecus/n2350/kwbimage.cfg.in file looks like this # Armada 38x uses version 1 image format VERSION 1 # Boot Media configurations BOOT_FROM spi # Binary Header (bin_hdr) with DDR4 training code BINARY board/thecus/n2350/binary.0 0000005b 00000068 When I kwboot the u-boot.kwb image (using kwboot binary built with 2023.01-rc4), the header was transferred successfully, but then the BootROM jumped to SPI u-boot, instead of loading the u-boot payload from UART. Please see the log below. <BEGIN LOG> # ./kwboot -t -p -B 115200 /dev/ttyUSB0 -b uboot.kwb kwboot version 2023.01-tld-1-00048-g19e15f9081-dirty Patching image boot signature to UART Aligning image header to Xmodem block size Sending boot message. Please reboot the target.../ Sending boot image header (97792 bytes)... 0 % [......................................................................] 9 % [......................................................................] <snip> 82 % [......................................................................] 91 % [................................................................ ] Done BootROM - 1.73 Booting from SPI flash <snip> U-Boot 2013.01 (Nov 12 2018 - 20:56:19) Marvell version: 2015_T1.0p18-tld-4 <END LOG> It seems kwboot patched the image, but the BOOT_FROM indicator was still recognized as from SPI. So the BootROM loaded the stock u-boot image from SPI and executed it. Since I am booting with bin_hdr, I'm not sure if there is something inside this blob that has forced this indicator to SPI. I'm attaching the u-boot.kwb image to this email, in case you are interested in taking a look at the structure. Thanks, Tony

4 26

[PATCH v2 1/1] doc: man-page for source command
by Heinrich Schuchardt 14 Jan '23

14 Jan '23

Provide a man-page for the source command. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- v2: describe defaults for arguments mention signing and verifying FIT images link to uImage.FIT/signature.txt add an example with incbin describe escaping hash sign provide examples without script address --- doc/usage/cmd/source.rst | 193 +++++++++++++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + 2 files changed, 194 insertions(+) create mode 100644 doc/usage/cmd/source.rst diff --git a/doc/usage/cmd/source.rst b/doc/usage/cmd/source.rst new file mode 100644 index 0000000000..61a4505909 --- /dev/null +++ b/doc/usage/cmd/source.rst @@ -0,0 +1,193 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright 2022, Heinrich Schuchardt <xypron.glpk(a)gmx.de> + +source command +============== + +Synopsis +-------- + +:: + + source [<addr>][:[<image>]|#[<config>]] + +Description +----------- + +The *source* command is used to execute a script file from memory. + +Two formats for script files exist: + +* legacy U-Boot image format +* Flat Image Tree (FIT) + +The benefit of the FIT images is that they can be signed and verifed as +decribed in :download:`signature.txt <../../uImage.FIT/signature.txt>`. + +Both formats can be created with the mkimage tool. + +addr + location of the script file in memory, defaults to CONFIG_SYS_LOAD_ADDR. + +image + name of an image in a FIT file + +config + name of a configuration in a FIT file. A hash sign following white space + starts a comment. Hence, if no *addr* is specified, the hash sign has to be + escaped with a backslash or the argument must be quoted. + +If both *image* and *config* are omitted, the default configuration is used, or +if no configuration is defined, the default image. + +Examples +-------- + +FIT image +''''''''' + +For creating a FIT image an image tree source file (\*.its) is needed. Here is +an example (source.its). + +.. code-block:: + + /dts-v1/; + + / { + description = "FIT image to test the source command"; + #address-cells = <1>; + + images { + default = "script-1"; + + script-1 { + data = "echo 1"; + type = "script"; + compression = "none"; + }; + + script-2 { + data = "echo 2"; + type = "script"; + compression = "none"; + }; + }; + + configurations { + default = "conf-2"; + + conf-1 { + script = "script-1"; + }; + + conf-2 { + script = "script-2"; + }; + }; + }; + +The FIT image file (boot.itb) is created with: + +.. code-block:: bash + + mkimage -f source.its boot.itb + +In U-Boot the script can be loaded and execute like this + +.. code-block:: + + => load host 0:1 $loadaddr boot.itb + 1552 bytes read in 0 ms + => source $loadaddr#conf-1 + ## Executing script at 00000000 + 1 + => source $loadaddr#conf-2 + ## Executing script at 00000000 + 2 + => source $loadaddr:script-1 + ## Executing script at 00000000 + 1 + => source $loadaddr:script-2 + ## Executing script at 00000000 + 2 + => source $loadaddr + ## Executing script at 00000000 + 2 + => source \#conf-1 + ## Executing script at 00000000 + 1 + => source '#conf-1' + ## Executing script at 00000000 + 1 + => source ':script-1' + ## Executing script at 00000000 + 1 + => source + ## Executing script at 00000000 + 2 + => + +Instead of specifying command line instructions directly in the *data* property +of the image tree source file another file can be included. Here is a minimal +example which encapsulates the file boot.txt: + +.. code-block:: + + /dts-v1/; + / { + description = ""; + images { + script { + data = /incbin/("./boot.txt"); + type = "script"; + }; + }; + }; + +Legacy U-Boot image +''''''''''''''''''' + +A script file using the legacy U-Boot image file format can be created based on +a text file. Let's use this example text file (boot.txt): + +.. code-block:: bash + + echo Hello from a script + echo ------------------- + +The boot scripts (boot.scr) is created with: + +.. code-block:: bash + + mkimage -T script -n 'Test script' -d boot.txt boot.scr + +The script can be execute in U-boot like this: + +.. code-block:: + + => load host 0:1 $loadaddr boot.scr + 122 bytes read in 0 ms + => source $loadaddr + ## Executing script at 00000000 + Hello from a script + ------------------- + => source + ## Executing script at 00000000 + Hello from a script + ------------------- + => + +Configuration +------------- + +The source command is only available if CONFIG_CMD_SOURCE=y. +The FIT image file format requires CONFIG_FIT=y.# +The legacy U-Boot image file format requires CONFIG_LEGACY_IMAGE_FORMAT=y. +On hardened systems support for the legacy U-Boot image format should be +disabled as these images cannot be signed and verified. + +Return value +------------ + +If the scripts is executed successfully, the return value $? is 0 (true). +Otherwise it is 1 (false). diff --git a/doc/usage/index.rst b/doc/usage/index.rst index bbd40a6e18..14457aba69 100644 --- a/doc/usage/index.rst +++ b/doc/usage/index.rst @@ -74,6 +74,7 @@ Shell commands cmd/setexpr cmd/size cmd/sound + cmd/source cmd/temperature cmd/tftpput cmd/true -- 2.37.2

2 1

[PATCH] sunxi: eMMC: support TOC0 on boot partitions
by Andre Przywara 14 Jan '23

14 Jan '23

To determine whether we have been booted from an eMMC boot partition, we replay some of the checks that the BROM must have done to successfully load the SPL. This involves a checksum check, which currently relies on the SPL being wrapped in an "eGON" header. If a board has secure boot enabled, the BROM will only accept the "TOC0" format, which is internally very different, but uses the same checksumming algorithm. Actually the only difference for calculating the checksum is that the size of the SPL is stored at a different offset. Do a header check to determine whether we deal with an eGON or TOC0 format, then set the SPL size accordingly. The rest of the code is unchanged. This fixes booting from an eMMC boot partition on devices with secure boot enabled, like the Remix Mini PC. Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> --- arch/arm/mach-sunxi/board.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 0c4b6dd1ca3..a90c88210cd 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -365,6 +365,7 @@ static bool sunxi_valid_emmc_boot(struct mmc *mmc) struct blk_desc *bd = mmc_get_blk_desc(mmc); u32 *buffer = (void *)(uintptr_t)CONFIG_TEXT_BASE; struct boot_file_head *egon_head = (void *)buffer; + struct toc0_main_info *toc0_info = (void *)buffer; int bootpart = EXT_CSD_EXTRACT_BOOT_PART(mmc->part_config); uint32_t spl_size, emmc_checksum, chksum = 0; ulong count; @@ -391,11 +392,17 @@ static bool sunxi_valid_emmc_boot(struct mmc *mmc) /* Read the first block to do some sanity checks on the eGON header. */ count = blk_dread(bd, 0, 1, buffer); - if (count != 1 || !sunxi_egon_valid(egon_head)) + if (count != 1) + return false; + + if (sunxi_egon_valid(egon_head)) + spl_size = buffer[4]; + else if (sunxi_toc0_valid(toc0_info)) + spl_size = buffer[7]; + else return false; /* Read the rest of the SPL now we know it's halfway sane. */ - spl_size = buffer[4]; count = blk_dread(bd, 1, DIV_ROUND_UP(spl_size, bd->blksz) - 1, buffer + bd->blksz / 4); -- 2.35.5

2 1

[PATCH] sunxi: f1c100s: re-enable SYSRESET
by Andre Przywara 14 Jan '23

14 Jan '23

The SoC .dtsi originally submitted for the Allwinner F1C100s had the wrong compatible string for the watchdog, which broke U-Boot's reset functionality. To quickly fix this, we disable CONFIG_SYSRESET in cfcf1952c11e6ffcbbf88 ("sunxi: f1c100s: Drop SYSRESET to enable reset functionality"), so that U-Boot's hardcoded reset driver could take over. After this was properly fixed in the devicetree, we reverted that patch in 92373de041ea ("Revert "sunxi: f1c100s: Drop SYSRESET to enable reset functionality"), however this line sneaked back in with d0ee7f295d74 ("Convert CONFIG_SYS_PBSIZE to Kconfig"), so during a Kconfig update. Remove this line (again), to use the proper reset driver. Fixes: d0ee7f295d74 ("Convert CONFIG_SYS_PBSIZE to Kconfig") Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> --- Hi, this is not critical (so nothing for 2023.01), reset works either way. But we should fix it anyway. Cheers, Andre configs/licheepi_nano_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/licheepi_nano_defconfig b/configs/licheepi_nano_defconfig index 12a43c1ec10..b25c9ba77cc 100644 --- a/configs/licheepi_nano_defconfig +++ b/configs/licheepi_nano_defconfig @@ -10,4 +10,3 @@ CONFIG_SPL_SPI_SUNXI=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_XTX=y CONFIG_SPI=y -# CONFIG_SYSRESET is not set -- 2.35.5

2 1

[PATCH] sunxi: f1c100s: Drop no-MMC hack
by Andre Przywara 14 Jan '23

14 Jan '23

When support for the Allwinner F1C100s SoC was originally introduced, its DT lacked any MMC nodes, which upset our sunxi-u-boot.dtsi overlay, when it tried to add an alias to the SD card. To quickly fix this back then, we guarded that alias with a preprocessor macro. Now the F1C100s family has gained MMC nodes, so we don't need the special treatment anymore. Just remove this guard. Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> --- arch/arm/dts/sunxi-u-boot.dtsi | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index 2028d5b6a90..e959eb2a405 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -12,9 +12,7 @@ / { aliases { -#ifndef CONFIG_MACH_SUNIV mmc0 = &mmc0; -#endif #if CONFIG_MMC_SUNXI_SLOT_EXTRA == 2 mmc1 = &mmc2; #endif -- 2.35.5

2 1