July 2023 - U-Boot

[RFC PATCH 0/3] Minimal platform configuration
by Jason Kacines 09 Aug '23

09 Aug '23

When someone attempts to bring up a custom board using TI SoCs (am62x in this case), it often takes several days for someone to reduce the current configuration from the TI EVM/SK boards to a configuration that works for their board. The goal of these changes is to allow for a minimal boot configuration to exist within UBoot that someone can access directly in order to test their boards for a sign of life before beginning development. This is all done with the hope to increase ease of use and reduce the upbringing process from several days to a few hours. With the use of fragments, the base defconfigs reside in configs/ and the config fragments reside in board/../ There is still quite a lot of board specific code inside board_init_f() that will need attention later, however this series begins the process of splitting the am62x's configs into a separate generic defconfig everyone can use for new board wakeups with individual board/ti/*.config fragments for each board varient. Jason Kacines (3): scripts: kconfig: Add config fragment support in board/../ configs: Add am62x wakeup defconfigs board: ti: am62x: Add am62x_evm defconfig fragments board/ti/am62x/am62x_evm_a53.config | 38 +++++++++++++ board/ti/am62x/am62x_evm_r5.config | 51 ++++++++++++++++++ ..._evm_a53_defconfig => am62x_a53_defconfig} | 34 ++---------- ...2x_evm_r5_defconfig => am62x_r5_defconfig} | 53 ++++--------------- scripts/kconfig/Makefile | 4 +- 5 files changed, 106 insertions(+), 74 deletions(-) create mode 100644 board/ti/am62x/am62x_evm_a53.config create mode 100644 board/ti/am62x/am62x_evm_r5.config rename configs/{am62x_evm_a53_defconfig => am62x_a53_defconfig} (72%) rename configs/{am62x_evm_r5_defconfig => am62x_r5_defconfig} (66%) -- 2.34.1

5 18

[PATCH v2 0/9] x86: Fixes for distro booting
by Simon Glass 09 Aug '23

09 Aug '23

This series collects together various fixes found whn testing out booting of distros using QEMU on x86. Together they improve functionality, but it is not perfect yet. Some notes are included as to the current state. Changes in v2: Use SPL_ instead of SPL_TPL_ - Drop unnecessary IS_ENABLED(CONFIG_X86) - Add a note that this reproduces reliably - Add a Kconfig as the suggested conditional did not work - Use sizeof(struct vesa_mode_info) instead Simon Glass (9): x86: spl: Drop unwanted debug() video: Tidy up Makefile rule for video x86: Run QEMU machine setup in SPL Revert "x86: Switch QEMU over to use the bochs driver" board_f: Fix corruption of relocaddr x86: Correct copying of BIOS mode information video: Add a Kconfig option for SPL video handoff x86: Enable useful options for qemu-86 x86: Update qemu documentation arch/x86/cpu/qemu/Kconfig | 2 +- arch/x86/cpu/qemu/qemu.c | 2 +- arch/x86/include/asm/qemu.h | 14 +++++ arch/x86/lib/bios.c | 2 +- arch/x86/lib/spl.c | 4 +- common/board_f.c | 6 +-- configs/qemu-x86_64_defconfig | 4 ++ configs/qemu-x86_defconfig | 12 +++++ doc/board/emulation/qemu-x86.rst | 88 ++++++++++++++++++++++++++++++-- drivers/Makefile | 4 +- drivers/video/Kconfig | 18 +++++++ drivers/video/video-uclass.c | 2 +- 12 files changed, 144 insertions(+), 14 deletions(-) create mode 100644 arch/x86/include/asm/qemu.h -- 2.41.0.487.g6d72f3e995-goog

5 26

[U-BOOT-TEST-HOOKS][PATCH v2 1/1] qemu-riscv: enable virtio-rng-device
by Heinrich Schuchardt 09 Aug '23

09 Aug '23

Linux' KASLR uses the EFI_RNG_PROTOCOL as entropy source. We should enable CONFIG_DM_RNG in U-Boot. For the EFI unit test for the protocol to succeed a virtio RNG device has to be provided when invoking QEMU. Reported-by: Leo Liang <ycliang(a)andestech.com> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- v2: use virtio-rng-device instead of virtio-rng-pci (virtio-rng-device does not require calling 'virtio scan') See related patch [PATCH 1/1] riscv: qemu: imply CONFIG_DM_RNG https://lists.denx.de/pipermail/u-boot/2023-July/525293.html --- bin/travis-ci/conf.qemu-riscv32_na | 2 +- bin/travis-ci/conf.qemu-riscv32_spl_na | 2 +- bin/travis-ci/conf.qemu-riscv64_na | 2 +- bin/travis-ci/conf.qemu-riscv64_spl_na | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/travis-ci/conf.qemu-riscv32_na b/bin/travis-ci/conf.qemu-riscv32_na index 5aa25e3..8163754 100644 --- a/bin/travis-ci/conf.qemu-riscv32_na +++ b/bin/travis-ci/conf.qemu-riscv32_na @@ -5,7 +5,7 @@ console_impl=qemu qemu_machine="virt" qemu_binary="qemu-system-riscv32" -qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0" +qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0 -device virtio-rng-device" qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/u-boot" reset_impl=none flash_impl=none diff --git a/bin/travis-ci/conf.qemu-riscv32_spl_na b/bin/travis-ci/conf.qemu-riscv32_spl_na index c1419c2..254ae18 100644 --- a/bin/travis-ci/conf.qemu-riscv32_spl_na +++ b/bin/travis-ci/conf.qemu-riscv32_spl_na @@ -5,7 +5,7 @@ console_impl=qemu qemu_machine="virt" qemu_binary="qemu-system-riscv32" -qemu_extra_args="-smp 4 -m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0" +qemu_extra_args="-smp 4 -m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0 -device virtio-rng-device" qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/spl/u-boot-spl -device loader,file=${U_BOOT_BUILD_DIR}/u-boot.itb,addr=0x80200000" reset_impl=none flash_impl=none diff --git a/bin/travis-ci/conf.qemu-riscv64_na b/bin/travis-ci/conf.qemu-riscv64_na index 90ab820..7c96dc2 100644 --- a/bin/travis-ci/conf.qemu-riscv64_na +++ b/bin/travis-ci/conf.qemu-riscv64_na @@ -5,7 +5,7 @@ console_impl=qemu qemu_machine="virt" qemu_binary="qemu-system-riscv64" -qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0" +qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0 -device virtio-rng-device" qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/u-boot" reset_impl=none flash_impl=none diff --git a/bin/travis-ci/conf.qemu-riscv64_spl_na b/bin/travis-ci/conf.qemu-riscv64_spl_na index c3d3dac..693fdf3 100644 --- a/bin/travis-ci/conf.qemu-riscv64_spl_na +++ b/bin/travis-ci/conf.qemu-riscv64_spl_na @@ -5,7 +5,7 @@ console_impl=qemu qemu_machine="virt" qemu_binary="qemu-system-riscv64" -qemu_extra_args="-smp 4 -m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0" +qemu_extra_args="-smp 4 -m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0 -device virtio-rng-device" qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/spl/u-boot-spl -device loader,file=${U_BOOT_BUILD_DIR}/u-boot.itb,addr=0x80200000" reset_impl=none flash_impl=none -- 2.40.1

3 2

[PATCH] regulator: preserve error code properly in regulator_list_autoset()
by Dan Carpenter 09 Aug '23

09 Aug '23

This code has a & vs && typo so it only preserves odd value error codes and not even value error codes. Signed-off-by: Dan Carpenter <dan.carpenter(a)linaro.org> --- drivers/power/regulator/regulator-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c index 3a6ba69f6d5f..52dd1bd3eafd 100644 --- a/drivers/power/regulator/regulator-uclass.c +++ b/drivers/power/regulator/regulator-uclass.c @@ -380,7 +380,7 @@ int regulator_list_autoset(const char *list_platname[], ret = regulator_autoset_by_name(list_platname[i], &dev); if (ret != -EMEDIUMTYPE && verbose) regulator_show(dev, ret); - if (ret & !error) + if (ret && !error) error = ret; if (list_devp) -- 2.39.2

3 3

[PATCH v7 0/4] Add StarFive JH7110 PCIe drvier support
by Minda Chen 09 Aug '23

09 Aug '23

These PCIe series patches are based on the JH7110 RISC-V SoC and VisionFive V2 board. The PCIe driver depends on gpio, pinctrl, clk and reset driver to do init. The PCIe dts configuation includes all these setting. The PCIe drivers codes has been tested on the VisionFive V2 boards. The test devices includes M.2 NVMe SSD and Realtek 8169 Ethernet adapter. patch1 is for fixing the compile error in designware_i2c_pci.c while enable designware i2c and PCI. previous patch version v1: https://patchwork.ozlabs.org/project/uboot/cover/20230223105240.15180-1-min… v2: https://patchwork.ozlabs.org/project/uboot/cover/20230308054833.95730-1-min… v3: https://patchwork.ozlabs.org/project/uboot/cover/20230329100143.10724-1-min… v4: https://patchwork.ozlabs.org/project/uboot/cover/20230411010209.76561-1-min… v5: https://patchwork.ozlabs.org/project/uboot/cover/20230423105859.125764-1-mi… v6: https://patchwork.ozlabs.org/project/uboot/cover/20230509082617.119018-1-mi… v7: https://patchwork.ozlabs.org/project/uboot/cover/20230720112333.9255-1-mind… changes v8 patch1: Add Kconfig for designware_i2c_pci.c v7 Add patch1 to fix compiling error while enable PCI. patch 2 and patch 3 rebase to latest mainline codes. v6 patch 3 1. Change one VisionFive2 config file. patch 4 1. remove the pcie interrupt-controller. interrupts setting revert to origin. setting. v5 patch 2 1. split PLDA controller driver codes to pcie_plda_common.c 2. correct the codes of record secondary number. patch 4 1. change the pcie dtsi config. make them the same with kernel. v4 patch 2 1. Remove the IDS_REVISION_ID macros. 2. Replace sec_busno to first_busno in starfive_pcie 3. Remove starfive_pcie_off_conf function. 4. Replace "imply" to "depends on" in PCIe Kconfig. 5 .Check sec_busno in starfive_pcie_addr_valid. v3 patch 2 1. remove the read vendor ID delay 2. remove starfive_pcie_hide_rc_bar function. do not hide host bridge BAR write. 3. Using PCIE_ECAM_OFFSET and PCI_CLASS_BRIDGE_PCI_NORMAL macros. 4. Add comments for bus and address limitation reason in function starfive_pcie_addr_valid 5. Change the multiple line comments in Line 373 6. Using gpio_request_by_name to get PCIe reset gpio,and using dm_gpio_set_value set GPIO value. patch 3 1. support PCIeboth 12a and 13b vf2 board. patch 4 1. reset dts change to reset-gpio. v2 1. remove clock commit. The pcie clocks change has been includeded in [1]. 2. Using GENMASK marco1 in patch1. 3. remove the syscon dts node in patch3. The syscon dts dts node has been included in [1]. Mason Huo (3): starfive: pci: Add StarFive JH7110 pcie driver configs: starfive-jh7110: Add support for PCIe host driver riscv: dts: starfive: Enable PCIe host controller Minda Chen (1): i2c: designware: Add Kconfig for designware_i2c_pci.c .../dts/jh7110-starfive-visionfive-2.dtsi | 11 + arch/riscv/dts/jh7110.dtsi | 74 ++++ configs/starfive_visionfive2_defconfig | 7 + drivers/i2c/Kconfig | 9 + drivers/i2c/Makefile | 4 +- drivers/pci/Kconfig | 13 + drivers/pci/Makefile | 2 + drivers/pci/pcie_plda_common.c | 116 +++++++ drivers/pci/pcie_plda_common.h | 118 +++++++ drivers/pci/pcie_starfive_jh7110.c | 317 ++++++++++++++++++ 10 files changed, 668 insertions(+), 3 deletions(-) create mode 100644 drivers/pci/pcie_plda_common.c create mode 100644 drivers/pci/pcie_plda_common.h create mode 100644 drivers/pci/pcie_starfive_jh7110.c base-commit: e6e67bb9e0a40f3eb3c87d16935192821987c3e0 -- 2.17.1

3 7

[PATCH 0/3] malloc: Reduce size by initializing data at runtime
by Sean Anderson 09 Aug '23

09 Aug '23

In my efforts to get SPL to fit into flash after some changes I made, I noticed that av_ is one of the largest variables in SPL. As it turns out, we can generate it at runtime, and the code is already there. This has the potential to save 1-2k across the board, for some minor boot time increase. Sean Anderson (3): malloc: Don't use ifdefs for SYS_MALLOC_DEFAULT_TO_INIT malloc: Don't statically initialize av_ if using malloc_init malloc: Enable SYS_MALLOC_RUNTIME_INIT by default in SPL Kconfig | 27 +++++++++++++++++---------- common/dlmalloc.c | 16 ++++++++-------- 2 files changed, 25 insertions(+), 18 deletions(-) -- 2.40.1

5 14

getting u-boot to work on raspi 3b (32bit)
by Robert Wenisch 09 Aug '23

09 Aug '23

Hello, in order to study the boot process of embedded ARM systems, I decided to start with something well documented: booting as raspi 3b using u-boot. I downloaded kernel sources and u-boot sources. I built the kernel with CROSS_COMPILE=arm-linux-gnueabihf- ARCH=arm make bcmrpi_defconfig CROSS_COMPILE=arm-linux-gnueabihf- ARCH=arm make -j6 zImage dtbs modules cp arch/arm/boot/zImage /path/to/sdcard-boot-partition cp arch/arm/boot/dts/bcm2710-rpi-3-b.dtb /path/to/sdcard-boot-partition CROSS_COMPILE=arm-linux-gnueabihf- ARCH=arm INSTALL_MOD_PATH make modules_install Further I compiled and setup u-boot: CROSS_COMPILE=arm-linux-gnueabihf- ARCH=arm make rpi_3_32b_defconfig CROSS_COMPILE=arm-linux-gnueabihf- ARCH=arm make -j6 cp u-boot.bin /path/to/ sdcard-boot-partition I then went on to edit the config.txt: kernel=u-boot-bin enable_uart=1 arm_64bit=0 device_tree=bcm2710-rpi-3-b.dtb and boot.txt goes fatload mmc 0:1 ${fdt_addr_r} bcm2710-rpi-3-b.dtb fatload mmc 0:1 $kernel_addr_r} zImage setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait rw earlyprintk bootz ${kernel_addr_r} - {fdt_addr_r} I produced an image of boot.txt mkimage -A arm -O linux -T script -d boot.txt boot.scr Frustratingly, it didn't go as smoothly as expected. With these setting I got up to state "Starting Kernel ..." over the serial port, then it freezes (or at least doesn't log anything on the tty). I can't post the whole log as I only have it on my dev-machine. However some interesting bits for now: I'm booting on u-boot 2023-07-0967-g94e7cb181a 1 - Pretty much at the beginning it says "Loading Environment from FAT... *** warning - bad CRC, using default environment" I suppose this only means we're not providing a .env file? 2 - Upon "Scanning bus usb@7e980000 for devices... it's logging a lot of garbage (as in misinterpreted character codes), what might be going on there? 3 - A bit further down it states "Found U-Boot script /boot.scr" [...] "## Executing script at 02400000" As this changes when I edit around the boot.txt and mkimage, I infer u-boot is indeed loading my boot instructions not just some default values. Then follow some info on kernel image flatted device tree blob and their respective memory addresses. It the tries to load the kernel to little apparent success :/ This procedure is what I gathered from a plethora of tutorial and howtos. Most of these are quite old, have there been breaking changes in u-boot's development in the meanwhile? For example some sources state the kernel is launched via booti ${kernel_addr_r} - {fdt_addr_r}, however the booti command seem to be absent in my u-boot version. Is there anything else I#m doing wrong? I'll be grateful for any hints at this point... Cheers Robert

2 3

[u-boot-test-hooks 1/4] bin/flash.sdwire_common_mount: Switch to sourcing the next writer script
by Tom Rini 09 Aug '23

09 Aug '23

Rather than invoking the script that will write to the mounted directory as a binary, source it as a script so that it has access to more than just two parameters. This will allow us to have the same flexibility in our writers that other flash methods have. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- bin/flash.sdwire_common_mount | 3 ++- bin/writer.rpi3_mount | 19 +++++++------------ bin/writer.zynq_mount | 15 +++++---------- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/bin/flash.sdwire_common_mount b/bin/flash.sdwire_common_mount index 6c763e62f47d..b76add064fb0 100644 --- a/bin/flash.sdwire_common_mount +++ b/bin/flash.sdwire_common_mount @@ -52,7 +52,8 @@ if ! mountpoint -q ${mount_dir}; then exit 1 fi -writer.${flash_writer} ${mount_dir} ${U_BOOT_BUILD_DIR} +# Perform the write, pass along as much environment as possible +. writer.${flash_writer} complete=false for i in {0..9}; do diff --git a/bin/writer.rpi3_mount b/bin/writer.rpi3_mount index 97f24a5ac694..a63e7999e57b 100755 --- a/bin/writer.rpi3_mount +++ b/bin/writer.rpi3_mount @@ -20,23 +20,18 @@ # Writes rpi3_b to the board -# Args: -# $1: Mount point of the sdcard when board is off -# $2: U-Boot build directory - set -ex -mount=$1 -build=$2 +build=${U_BOOT_BUILD_DIR} -echo "Writing to ${mount} from build at ${build}" +echo "Writing to ${mount_dir} from build at ${build}" # First make a copy of the original files if we haven't already -if [[ ! -e ${mount}/config.orig ]]; then - cp ${mount}/config.txt ${mount}/config.orig +if [[ ! -e ${mount_dir}/config.orig ]]; then + cp ${mount_dir}/config.txt ${mount_dir}/config.orig fi -if [[ ! -e ${mount}/rpi3-u-boot.bin.orig ]]; then - cp ${mount}/rpi3-u-boot.bin ${mount}/rpi3-u-boot.bin.orig +if [[ ! -e ${mount_dir}/rpi3-u-boot.bin.orig ]]; then + cp ${mount_dir}/rpi3-u-boot.bin ${mount_dir}/rpi3-u-boot.bin.orig fi # Enable the UART and fix the GPU frequency so it works correctly @@ -46,4 +41,4 @@ if ! grep -q "^gpu_freq=250" /media/rpi3_b_boot/config.txt; then fi # Copy U-Boot over from the build directory -cp ${build}/u-boot.bin ${mount}/rpi3-u-boot.bin +cp ${build}/u-boot.bin ${mount_dir}/rpi3-u-boot.bin diff --git a/bin/writer.zynq_mount b/bin/writer.zynq_mount index 9d0958880422..c8395a40680e 100755 --- a/bin/writer.zynq_mount +++ b/bin/writer.zynq_mount @@ -20,22 +20,17 @@ # Writes zynq images to the board -# Args: -# $1: Mount point of the sdcard when board is off -# $2: U-Boot build directory - set -ex tmp=$(mktemp -d) -mount=$1 -build=$2 +build=${U_BOOT_BUILD_DIR} -echo "Writing to ${mount} from build at ${build}" +echo "Writing to ${mount_dir} from build at ${build}" # Copy U-Boot over from the build directory -cp ${build}/u-boot.bin ${mount}/rpi3-u-boot.bin +cp ${build}/u-boot.bin ${mount_dir}/rpi3-u-boot.bin zynq-boot-bin.py -o ${tmp}/boot.bin -u ${build}/spl/u-boot-spl-dtb.bin -cp ${tmp}/boot.bin ${mount}/BOOT.bin -cp ${build}/u-boot.img ${mount}/. +cp ${tmp}/boot.bin ${mount_dir}/BOOT.bin +cp ${build}/u-boot.img ${mount_dir}/. rm -rf ${tmp} -- 2.34.1

3 8

[PATCH] test: fix a couple NULL vs IS_ERR() checks
by Dan Carpenter 09 Aug '23

09 Aug '23

The x509_cert_parse() and pkcs7_parse_message() functions return error pointers. They don't return NULL. Update the checks accordingly. Signed-off-by: Dan Carpenter <dan.carpenter(a)linaro.org> --- test/lib/asn1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/lib/asn1.c b/test/lib/asn1.c index 8661fdd30687..a66cdd77df0a 100644 --- a/test/lib/asn1.c +++ b/test/lib/asn1.c @@ -120,7 +120,7 @@ static int lib_asn1_x509(struct unit_test_state *uts) cert = x509_cert_parse(cert_data, cert_data_len); - ut_assertf(cert != NULL, "decoding failed\n"); + ut_assertf(!IS_ERR(cert), "decoding failed\n"); ut_assertf(!strcmp(cert->subject, "Linaro: Tester"), "subject doesn't match\n"); ut_assertf(!strcmp(cert->issuer, "Linaro: Tester"), @@ -313,7 +313,7 @@ static int lib_asn1_pkcs7(struct unit_test_state *uts) pkcs7 = pkcs7_parse_message(image_pk7, image_pk7_len); - ut_assertf(pkcs7 != NULL, "decoding failed\n"); + ut_assertf(!IS_ERR(pkcs7), "decoding failed\n"); ut_assertf(pkcs7->data_len == 104, "signature size doesn't match\n"); ut_assertf(pkcs7->signed_infos != NULL, "sign-info doesn't exist\n"); ut_assertf(pkcs7->signed_infos->msgdigest_len == 32, -- 2.39.2

3 2

[PATCH] expo: allocate correct ammount of memory
by Dan Carpenter 09 Aug '23

09 Aug '23

This should be allocating the memory for "item" instead of "menu". The item struct is 48 bytes instead of 96 (assuming a 64bit system) so this saves a little memory. Signed-off-by: Dan Carpenter <dan.carpenter(a)linaro.org> --- boot/scene_menu.c | 2 +- 1 file changed, 1 insertions(+), 1 deletions(-) diff --git a/boot/scene_menu.c b/boot/scene_menu.c index 8a355f838cc8..57ffb523ff3f 100644 --- a/boot/scene_menu.c +++ b/boot/scene_menu.c @@ -416,7 +416,7 @@ int scene_menuitem(struct scene *scn, uint menu_id, const char *name, uint id, if (!scene_obj_find(scn, label_id, SCENEOBJT_TEXT)) return log_msg_ret("txt", -EINVAL); - item = calloc(1, sizeof(struct scene_obj_menu)); + item = calloc(1, sizeof(struct scene_menitem)); if (!item) return log_msg_ret("item", -ENOMEM); item->name = strdup(name); -- 2.39.2

3 2