July 2021 - U-Boot

[PATCH] stm32mp1: add pull-up for gpio button PA13 and PA14
by Patrick Delaunay 27 Jul '21

27 Jul '21

When a push-button is released and PA13/PA14 are defined as input (high-Z) the LED should not be active as the circuit is open but a small current leak through PCB or push-button close the circuit and allows a small LED bias giving erroneous level voltage. So it is recommended to activate an internal pull-up in order to clearly fix the voltage at PA13/PA14 when button is released and to wait a short delay before to read the GPIO value only when the pull-up is correctly configured. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 4 ++-- arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi | 4 ++-- board/st/stm32mp1/stm32mp1.c | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi index 6787619290..d44da7566f 100644 --- a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi @@ -18,8 +18,8 @@ u-boot,error-led = "error"; u-boot,mmc-env-partition = "ssbl"; st,adc_usb_pd = <&adc1 18>, <&adc1 19>; - st,fastboot-gpios = <&gpioa 13 GPIO_ACTIVE_LOW>; - st,stm32prog-gpios = <&gpioa 14 GPIO_ACTIVE_LOW>; + st,fastboot-gpios = <&gpioa 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + st,stm32prog-gpios = <&gpioa 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; }; firmware { diff --git a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi index f3002e995b..3b94218b2f 100644 --- a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi @@ -18,8 +18,8 @@ u-boot,boot-led = "heartbeat"; u-boot,error-led = "error"; u-boot,mmc-env-partition = "ssbl"; - st,fastboot-gpios = <&gpioa 13 GPIO_ACTIVE_LOW>; - st,stm32prog-gpios = <&gpioa 14 GPIO_ACTIVE_LOW>; + st,fastboot-gpios = <&gpioa 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + st,stm32prog-gpios = <&gpioa 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; }; firmware { diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index 18b8870269..e1796e7e31 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -155,6 +155,7 @@ static void board_key_check(void) &gpio, GPIOD_IS_IN)) { log_debug("could not find a /config/st,fastboot-gpios\n"); } else { + udelay(20); if (dm_gpio_get_value(&gpio)) { log_notice("Fastboot key pressed, "); boot_mode = BOOT_FASTBOOT; @@ -168,6 +169,7 @@ static void board_key_check(void) &gpio, GPIOD_IS_IN)) { log_debug("could not find a /config/st,stm32prog-gpios\n"); } else { + udelay(20); if (dm_gpio_get_value(&gpio)) { log_notice("STM32Programmer key pressed, "); boot_mode = BOOT_STM32PROG; -- 2.25.1

3 2

[PATCH] arm: stm32mp1: force boot_device variable for invalid TAMP register value
by Patrick Delaunay 27 Jul '21

27 Jul '21

When the TAMP register 20 have an invalid value (0x0 for example after TAMPER error) the "boot_device" U-Boot env variable have no value and no error is displayed in U-Boot log. The STM32MP boot command bootcmd_stm32mp failed with strange trace: "Boot over !" and the next command in bootcmd_stm32mp failed with few indication: if test ${boot_device} = serial || test ${boot_device} = usb; then stm32prog ${boot_device} ${boot_instance}; As it is difficult to investigate, the current patch avoids this issue: - change the debug message to error: "unexpected boot mode" is displayed - display trace "Boot over invalid!" in bootcmd_stm32mp - execute "run distro_bootcmd" to try all the possible target Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- arch/arm/mach-stm32mp/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c index 592bfd413d..5ea1ddc497 100644 --- a/arch/arm/mach-stm32mp/cpu.c +++ b/arch/arm/mach-stm32mp/cpu.c @@ -542,7 +542,9 @@ static void setup_boot_mode(void) env_set("boot_instance", "0"); break; default: - log_debug("unexpected boot mode = %x\n", boot_mode); + env_set("boot_device", "invalid"); + env_set("boot_instance", ""); + log_err("unexpected boot mode = %x\n", boot_mode); break; } -- 2.25.1

3 3

[PATCH 1/2] phy: meson-axg-mipi: Rename "priv_auto_alloc_size" to "priv_auto"
by Alper Nebi Yasak 27 Jul '21

27 Jul '21

With commit 41575d8e4c33 ("dm: treewide: Rename auto_alloc_size members to be shorter") "priv_auto_alloc_size" was renamed to "priv_auto". Apply the rename to these two drivers as well. Fixes: 4547551aa019 ("phy: Add Amlogic AXG MIPI PCIe Analog PHY driver") Fixes: 7ef19503bacf ("phy: Add Amlogic AXG MIPI D-PHY driver") Signed-off-by: Alper Nebi Yasak <alpernebiyasak(a)gmail.com> --- drivers/phy/meson-axg-mipi-dphy.c | 2 +- drivers/phy/meson-axg-mipi-pcie-analog.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/phy/meson-axg-mipi-dphy.c b/drivers/phy/meson-axg-mipi-dphy.c index 8b2469793ddc..cf2a1cd14c7f 100644 --- a/drivers/phy/meson-axg-mipi-dphy.c +++ b/drivers/phy/meson-axg-mipi-dphy.c @@ -389,5 +389,5 @@ U_BOOT_DRIVER(meson_axg_mipi_dphy) = { .of_match = meson_axg_mipi_dphy_ids, .probe = meson_axg_mipi_dphy_probe, .ops = &meson_axg_mipi_dphy_ops, - .priv_auto_alloc_size = sizeof(struct phy_meson_axg_mipi_dphy_priv), + .priv_auto = sizeof(struct phy_meson_axg_mipi_dphy_priv), }; diff --git a/drivers/phy/meson-axg-mipi-pcie-analog.c b/drivers/phy/meson-axg-mipi-pcie-analog.c index 276e6004e5ee..7106c23d508f 100644 --- a/drivers/phy/meson-axg-mipi-pcie-analog.c +++ b/drivers/phy/meson-axg-mipi-pcie-analog.c @@ -229,5 +229,5 @@ U_BOOT_DRIVER(meson_axg_mipi_pcie_analog) = { .of_match = meson_axg_mipi_pcie_analog_ids, .probe = meson_axg_mipi_pcie_analog_probe, .ops = &meson_axg_mipi_pcie_analog_ops, - .priv_auto_alloc_size = sizeof(struct phy_meson_axg_mipi_pcie_analog_priv), + .priv_auto = sizeof(struct phy_meson_axg_mipi_pcie_analog_priv), }; -- 2.31.1

3 5

[PATCH] ARM: dts: meson: Use devicetree for SMBIOS settings for Khadas VIM boards
by Artem Lapkin 27 Jul '21

27 Jul '21

Khadas vim series: Use devicetree for SMBIOS settings Add settings and enable the default sysinfo driver so that these can come from the device tree. Reviewed-by: Neil Armstrong <narmstrong(a)baylibre.com> Signed-off-by: Artem Lapkin <art(a)khadas.com> --- .../meson-g12b-a311d-khadas-vim3-u-boot.dtsi | 23 +++++++++++++++++++ .../meson-gxl-s905x-khadas-vim-u-boot.dtsi | 23 +++++++++++++++++++ .../arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi | 21 +++++++++++++++++ .../dts/meson-sm1-khadas-vim3l-u-boot.dtsi | 23 +++++++++++++++++++ 4 files changed, 90 insertions(+) diff --git a/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi b/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi index 489efa15..fcd6f053 100644 --- a/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi @@ -6,3 +6,26 @@ #include "meson-g12-common-u-boot.dtsi" #include "meson-khadas-vim3-u-boot.dtsi" + +/ { + smbios { + compatible = "u-boot,sysinfo-smbios"; + + smbios { + system { + manufacturer = "khadas"; + product = "VIM3"; + }; + + baseboard { + manufacturer = "khadas"; + product = "VIM3"; + }; + + chassis { + manufacturer = "khadas"; + product = "VIM3"; + }; + }; + }; +}; diff --git a/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi b/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi index 39270ea7..20e36d1b 100644 --- a/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi +++ b/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi @@ -5,3 +5,26 @@ */ #include "meson-gxl-u-boot.dtsi" + +/ { + smbios { + compatible = "u-boot,sysinfo-smbios"; + + smbios { + system { + manufacturer = "khadas"; + product = "VIM"; + }; + + baseboard { + manufacturer = "khadas"; + product = "VIM"; + }; + + chassis { + manufacturer = "khadas"; + product = "VIM"; + }; + }; + }; +}; diff --git a/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi b/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi index c1763336..41480c9a 100644 --- a/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi +++ b/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi @@ -10,6 +10,27 @@ aliases { spi0 = &spifc; }; + + smbios { + compatible = "u-boot,sysinfo-smbios"; + + smbios { + system { + manufacturer = "khadas"; + product = "VIM2"; + }; + + baseboard { + manufacturer = "khadas"; + product = "VIM2"; + }; + + chassis { + manufacturer = "khadas"; + product = "VIM2"; + }; + }; + }; }; &sd_emmc_c { diff --git a/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi b/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi index a591c0c9..06b81f23 100644 --- a/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi +++ b/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi @@ -6,3 +6,26 @@ #include "meson-sm1-u-boot.dtsi" #include "meson-khadas-vim3-u-boot.dtsi" + +/ { + smbios { + compatible = "u-boot,sysinfo-smbios"; + + smbios { + system { + manufacturer = "khadas"; + product = "VIM3L"; + }; + + baseboard { + manufacturer = "khadas"; + product = "VIM3L"; + }; + + chassis { + manufacturer = "khadas"; + product = "VIM3L"; + }; + }; + }; +}; -- 2.25.1

2 3

[PATCH] meson64: add kernel compression vars
by Artem Lapkin 27 Jul '21

27 Jul '21

make possible to load simple compressed linux kernel for meson64 Signed-off-by: Artem Lapkin <art(a)khadas.com> --- include/configs/meson64.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/meson64.h b/include/configs/meson64.h index e3d25493..552a08c2 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -113,6 +113,8 @@ "stdin=" STDIN_CFG "\0" \ "stdout=" STDOUT_CFG "\0" \ "stderr=" STDOUT_CFG "\0" \ + "kernel_comp_addr_r=0x0d080000\0" \ + "kernel_comp_size=0x2000000\0" \ "fdt_addr_r=0x08008000\0" \ "loadaddr=0x01000000\0" \ "scriptaddr=0x08000000\0" \ -- 2.25.1

2 2

[PATCH] board: amlogic: vim3: fix phy-names property setup
by Artem Lapkin 27 Jul '21

27 Jul '21

phy-names was improperly implemented resulting in an inoperable USB-OTG port. - phy-names = "usb2-phy0\0\0usb2-phy1\0"; + phy-names = "usb2-phy0\0usb2-phy1"; Signed-off-by: Artem Lapkin <art(a)khadas.com> --- board/amlogic/vim3/vim3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c index c8ebd676..6a67a39c 100644 --- a/board/amlogic/vim3/vim3.c +++ b/board/amlogic/vim3/vim3.c @@ -109,8 +109,8 @@ int meson_ft_board_setup(void *blob, struct bd_info *bd) } /* Update PHY names (mandatory to disable USB3.0) */ - len = strlcpy(data, "usb2-phy0", 32) + 1; - len += strlcpy(&data[len], "usb2-phy1", 32 - len) + 1; + len = strlcpy(data, "usb2-phy0", 32); + len += strlcpy(&data[len], "usb2-phy1", 32 - len); ret = fdt_setprop(blob, node, "phy-names", data, len); if (ret < 0) { printf("vim3: failed to update usb phy names property (%d)\n", ret); -- 2.25.1

2 2

ubi0 warning: ubi_io_read: error -74 (ECC error) while reading 64 bytes from PEB 0:0, read only 64 bytes, retry
by Ivan Riabtsov 27 Jul '21

27 Jul '21

Hi everyone. I have a boot problem on the imx28 board, the problem repeats with kernels 4.14.67 and 5.10.50, so I decided to ask on the u-boot mailing list as I think the problem is not kernel related, but related to u-boot variables. i have the following u-boot variables in boot.scr: setenv mtdparts "mtdparts="gpmi-nand:3m(bootloader)ro,512k(environment),512k(redundant-environment),8m(kernel),512k(fdt),8m(ramdisk),120m(filesystem),-(data)""; setenv nandargs "setenv bootargs console=${console_mainline},${baudrate} rootfstype=ubifs ubi.mtd=6 root=ubi0_0 ${mtdparts}"; setenv mmcroot "/dev/mmcblk0p3"; setenv nandboot "mtdparts default; run nandargs; nand read ${loadaddr} kernel 0x00600000; if test ${boot_fdt} = yes; then nand read ${fdt_addr} fdt 0x00080000; bootz ${loadaddr} - ${fdt_addr}; else if test ${boot_fdt} = no; then bootz; else echo \"ERROR: Set boot_fdt to yes or no.\"; fi; fi"; setenv nandinstall "nand device 0; nand erase.part environment; nand erase.part redundant-environment; run update_nand_firmware_full; run update_nand_fdt; run update_nand_kernel; run update_nand_filesystem; setenv -f bootcmd run nandboot; saveenv"; run nandinstall; run nandboot i have the following message from kernel: [ 0.844421] nand: device found, Manufacturer ID: 0x2c, Chip ID: 0xda [ 0.850905] nand: Micron MT29F2G08ABAGAWP [ 0.855105] nand: 256 MiB, SLC, erase size: 128 KiB, page size: 2048, OOB size: 128 [ 0.864171] Scanning device for bad blocks [ 0.869121] Bad eraseblock 1 at 0x000000020000 [ 0.874013] Bad eraseblock 2 at 0x000000040000 [ 0.878902] Bad eraseblock 3 at 0x000000060000 [ 1.467707] 8 cmdlinepart partitions found on MTD device gpmi-nand [ 1.474039] Creating 8 MTD partitions on "gpmi-nand": [ 1.479226] 0x000000000000-0x000000300000 : "bootloader" [ 1.487702] 0x000000300000-0x000000380000 : "environment" [ 1.496007] 0x000000380000-0x000000400000 : "redundant-environment" [ 1.505268] 0x000000400000-0x000000c00000 : "kernel" [ 1.513550] 0x000000c00000-0x000000c80000 : "fdt" [ 1.521245] 0x000000c80000-0x000001480000 : "ramdisk" [ 1.529673] 0x000001480000-0x000008c80000 : "filesystem" [ 1.544252] 0x000008c80000-0x000010000000 : "data" [ 1.558113] gpmi-nand 8000c000.gpmi-nand: driver registered. On the basis of which, I conclude that the parameters are passed to the kernel correctly. Bad blocks are not a problem, they are declared by the manufacturer. and i have the following error from kernel: [ 2.059793] ubi0: attaching mtd6 [ 2.102255] ubi0 error: ubi_io_read: error -74 (ECC error) while reading 64 bytes from PEB 0:0, read 64 bytes [ 2.112325] CPU: 0 PID: 1 Comm: swapper Not tainted 5.10.50 #1 [ 2.118272] Hardware name: Freescale MXS (Device Tree) [ 2.123582] [<c0010084>] (unwind_backtrace) from [<c000dea4>] (show_stack+0x10/0x14) [ 2.131485] [<c000dea4>] (show_stack) from [<c03ce4fc>] (ubi_io_read+0x110/0x2f0) [ 2.139122] [<c03ce4fc>] (ubi_io_read) from [<c03ce900>] (ubi_io_read_ec_hdr+0x44/0x244) Please, tell me in which direction to look for the causes of the error, thank you very much.

1 0

[PATCH 00/33] pci: Drop all pre-driver model code
by Simon Glass 27 Jul '21

27 Jul '21

4 38

[PATCH v3] qemu-riscv64_smode: fix extlinux (define preboot)
by Dimitri John Ledkov 27 Jul '21

27 Jul '21

Commit 37304aaf60bf ("Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig") removed preboot commands in RISC-V targets and broke extlinux support as reported by Fu Wei <wefu(a)redhat.com>. The patch finishes migration of CONFIG_USE_PREBOOT and CONFIG_REBOOT to Kconfig. Fixes: 37304aaf60bf ("Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig") Reported-By: Fu Wei <wefu(a)redhat.com> Signed-off-by: David Abdurachmanov <david.abdurachmanov(a)sifive.com> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov(a)canonical.com> --- changes since my v1 patch: - Add reported-by & fixes tags changes since my v2 patch: - use savedefconfig to order defconfig correctly Original patch author is David Abdurachmanov Previously this was submitted in 2019 https://patchwork.ozlabs.org/project/uboot/patch/20190821190720.4286-1-davi… Since then the sifive fu540 portion of this change was merged, but not the qemu one. Submitting the qemu portion again. Without this change, qemu smode cannot boot Ubuntu's riscv64 cloud images with extlinux.conf. configs/qemu-riscv64_smode_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig index 0000564e41..4a6416e254 100644 --- a/configs/qemu-riscv64_smode_defconfig +++ b/configs/qemu-riscv64_smode_defconfig @@ -6,6 +6,8 @@ CONFIG_ARCH_RV64I=y CONFIG_RISCV_SMODE=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y CONFIG_CMD_BOOTEFI_SELFTEST=y -- 2.30.2

2 1

[PATCH v2 0/2] cmd/sbi: add missing SBI information
by Heinrich Schuchardt 27 Jul '21

27 Jul '21

The series provides library functions to read * SBI implementation version * machine vendor ID * machine architecture ID * machine implementation ID and enhances the sbi command to display this information. v2: Add constants for hart suspend and resume. Heinrich Schuchardt (2): riscv: add missing SBI extension definitions cmd/sbi: add missing SBI information arch/riscv/include/asm/sbi.h | 39 ++++++++++++++++++++++++++++++++++-- cmd/riscv/sbi.c | 19 +++++++++++++++++- 2 files changed, 55 insertions(+), 3 deletions(-) -- 2.30.2

2 3