May 2023 - U-Boot

[PATCH] usb: ehci-mx6: remove unnecessary regulator enable from probe
by Tim Harvey 13 Jul '23

13 Jul '23

Remove the regulator_set_enable() call from device probe which resolves a regulator imbalance. This is unnecessary as regulator_set_enable() will be called when ehci_register calls the init_after_reset hook. Suggested-by: Marek Vasut <marex(a)denx.de> Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- drivers/usb/host/ehci-mx6.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index fae20838c60a..a9ed5e7a0d53 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -709,18 +709,6 @@ static int ehci_usb_probe(struct udevice *dev) goto err_regulator; #endif -#if CONFIG_IS_ENABLED(DM_REGULATOR) - if (priv->vbus_supply) { - ret = regulator_set_enable(priv->vbus_supply, - (type == USB_INIT_DEVICE) ? - false : true); - if (ret && ret != -ENOSYS) { - printf("Error enabling VBUS supply (ret=%i)\n", ret); - goto err_clk; - } - } -#endif - if (priv->init_type == USB_INIT_HOST) { setbits_le32(&ehci->usbmode, CM_HOST); writel(mx6_portsc(priv->phy_type), &ehci->portsc); @@ -744,10 +732,6 @@ err_phy: generic_shutdown_phy(&priv->phy); err_regulator: #endif -#if CONFIG_IS_ENABLED(DM_REGULATOR) - if (priv->vbus_supply) - regulator_set_enable(priv->vbus_supply, false); -#endif err_clk: #if CONFIG_IS_ENABLED(CLK) clk_disable(&priv->clk); -- 2.25.1

2 2

[PATCH 0/5] rockchip: rk3568: Use dwc3-generic driver
by Jonas Karlman 13 Jul '23

13 Jul '23

This series add support for rk3568 in dwc3-generic driver and change to use the dwc3-generic driver for rk3568 devices having usb enabled. After these changes it should be possible to support usb gadget on rk3568 with e.g.: # CONFIG_USB_FUNCTION_FASTBOOT is not set CONFIG_DM_USB_GADGET=y CONFIG_USB_GADGET=y Patch 1 reverts addition of now unnecessary regulator-boot-on props. Patch 2 improve support for childless glue/ctrl dt node. Patch 3 relax a hard error when usb gadget support is not enabled. Patch 4 add support for the glue/ctrl dt node used by rk3568. Patch 5 change rk3568 devices to use dwc3-generic driver. This series is also available at [1] [1] https://github.com/Kwiboo/u-boot-rockchip/commits/rk3568-dwc3-generic-v1 Jonas Karlman (5): Revert "arm: dts: rockchip: radxa-cm3-io, rock-3a: enable regulators for usb" usb: dwc3-generic: Return early when there is no child node usb: dwc3-generic: Relax unsupported dr_mode check usb: dwc3-generic: Add rk3568 support rockchip: rk3568: Use dwc3-generic driver arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi | 4 --- arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 8 ------ configs/radxa-cm3-io-rk3566_defconfig | 2 +- configs/rock-3a-rk3568_defconfig | 2 +- drivers/usb/dwc3/dwc3-generic.c | 27 ++++++++++++++++---- 5 files changed, 24 insertions(+), 19 deletions(-) -- 2.40.1

3 16

[PATCH] arm64: imx: imx8mp-beacon: Enable LTO
by Adam Ford 13 Jul '23

13 Jul '23

With LTO enabled, SPL shrinks about 10K and U-Boot shrinks about 30K. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/configs/imx8mp_beacon_defconfig b/configs/imx8mp_beacon_defconfig index e8ddd537c0..86d0de3a30 100644 --- a/configs/imx8mp_beacon_defconfig +++ b/configs/imx8mp_beacon_defconfig @@ -34,6 +34,7 @@ CONFIG_ARMV8_EA_EL3_FIRST=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_SYS_LOAD_ADDR=0x40480000 CONFIG_SYS_MONITOR_LEN=524288 +CONFIG_LTO=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 -- 2.39.2

2 1

[PATCH] fdt: cmd: allow to add chosen properties
by Alexander Couzens 12 Jul '23

12 Jul '23

Add command fdt chosenu32/chosenstr to allow setting runtime properties. This is useful to pass information to the OS. E.g. which slot is currently booted in a A/B/recovery scheme. Or the reset reason which may only visitable to the u-boot. Scripts can use: > fdt chosenstr u-boot,abboot b To inform the OS which slot was booted. or pass u32 > fdt chosenu32 u-boot,try 3 Signed-off-by: Alexander Couzens <lynxis(a)fe80.eu> --- cmd/fdt.c | 10 +++++++ common/fdt_support.c | 69 +++++++++++++++++++++++++++++++++++++++++++ include/fdt_support.h | 2 ++ 3 files changed, 81 insertions(+) diff --git a/cmd/fdt.c b/cmd/fdt.c index aae3278526c4..050014cccd0e 100644 --- a/cmd/fdt.c +++ b/cmd/fdt.c @@ -278,6 +278,14 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return CMD_RET_SUCCESS; } + else if (strncmp(argv[1], "chosenstr", 3) == 0) { + if (argc != 4) + return CMD_RET_USAGE; + + fdt_chosen_set_str(argv[2], argv[3]); + return 0; + } + if (!working_fdt) { puts("No FDT memory address configured. Please configure\n" "the FDT address via \"fdt addr <address>\" command.\n" @@ -1147,6 +1155,8 @@ static char fdt_help_text[] = "fdt rsvmem delete <index> - Delete a mem reserves\n" "fdt chosen [<start> <size>] - Add/update the /chosen branch in the tree\n" " <start>/<size> - initrd start addr/size\n" + "fdt chosenu32 key value - Add key to /chosen with u32 value\n" + "fdt chosenstr key value - Add key to /chosen with string value\n" #if defined(CONFIG_FIT_SIGNATURE) "fdt checksign [<addr>] - check FIT signature\n" " <addr> - address of key blob\n" diff --git a/common/fdt_support.c b/common/fdt_support.c index 2053fe3bad83..33b22ebc94ad 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -10,10 +10,12 @@ #include <abuf.h> #include <env.h> #include <log.h> +#include <malloc.h> #include <mapmem.h> #include <net.h> #include <stdio_dev.h> #include <linux/ctype.h> +#include <linux/list.h> #include <linux/types.h> #include <asm/global_data.h> #include <linux/libfdt.h> @@ -22,6 +24,21 @@ #include <fdtdec.h> #include <version.h> +static LIST_HEAD(chosen_entries); + +enum fdt_chosen_type { + FDT_CHOSEN_TYPE_U32, + FDT_CHOSEN_TYPE_STR, +}; + +struct fdt_chosen_entry { + struct list_head list; + enum fdt_chosen_type type; + char *key; + char *str; + u32 u32; +}; + /** * fdt_getprop_u32_default_node - Return a node's property or a default * @@ -269,6 +286,34 @@ int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end) return 0; } +int fdt_chosen_set_str(char *key, char *value) +{ + struct fdt_chosen_entry *entry = calloc(1, sizeof(*entry)); + + if (!entry) + return 1; + + entry->type = FDT_CHOSEN_TYPE_STR; + entry->key = strdup(key); + entry->str = strdup(value); + list_add_tail(&entry->list, &chosen_entries); + return 0; +} + +int fdt_chosen_set_int(char *key, u32 value) +{ + struct fdt_chosen_entry *entry = calloc(1, sizeof(*entry)); + + if (!entry) + return 1; + + entry->type = FDT_CHOSEN_TYPE_U32; + entry->key = strdup(key); + entry->u32 = value; + list_add_tail(&entry->list, &chosen_entries); + return 0; +} + /** * board_fdt_chosen_bootargs - boards may override this function to use * alternative kernel command line arguments @@ -284,6 +329,7 @@ int fdt_chosen(void *fdt) int nodeoffset; int err; char *str; /* used to set string properties */ + struct list_head *entry; err = fdt_check_header(fdt); if (err < 0) { @@ -319,6 +365,29 @@ int fdt_chosen(void *fdt) } } + list_for_each(entry, &chosen_entries) { + struct fdt_chosen_entry *chosen = list_entry(entry, struct fdt_chosen_entry, list); + + switch (chosen->type) { + case FDT_CHOSEN_TYPE_STR: + err = fdt_setprop_string(fdt, nodeoffset, chosen->key, chosen->str); + if (err < 0) { + printf("WARNING: could not set fdt %s to %s. Error: %s.\n", + chosen->key, chosen->str, fdt_strerror(err)); + continue; + } + break; + case FDT_CHOSEN_TYPE_U32: + err = fdt_setprop_u32(fdt, nodeoffset, chosen->key, chosen->u32); + if (err < 0) { + printf("WARNING: could not set fdt %s to %d. Error: %s.\n", + chosen->key, chosen->u32, fdt_strerror(err)); + continue; + } + break; + } + } + /* add u-boot version */ err = fdt_setprop(fdt, nodeoffset, "u-boot,version", PLAIN_VERSION, strlen(PLAIN_VERSION) + 1); diff --git a/include/fdt_support.h b/include/fdt_support.h index 5638bd4f1655..b1c331f05370 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -51,6 +51,8 @@ int fdt_root(void *fdt); * Return: 0 if ok, or -FDT_ERR_... on error */ int fdt_chosen(void *fdt); +int fdt_chosen_set_str(char *key, char *value); +int fdt_chosen_set_int(char *key, u32 value); /** * Add initrd information to the FDT before booting the OS. -- 2.40.1

2 1

[PATCH 1/2] clk: imx8mp: Update clocks based on kernel 6.4-RC4
by Adam Ford 12 Jul '23

12 Jul '23

There are some newer clocks added to the kernel recently, so to fix prepare for resycing the device trees, update the clock list. Since there are some minor changes to the USB clocks, update which USB clocks are enabled to match with the upstream kernel as well. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c index 09bef596f2..a21a3ce34b 100644 --- a/drivers/clk/imx/clk-imx8mp.c +++ b/drivers/clk/imx/clk-imx8mp.c @@ -337,7 +337,8 @@ static int imx8mp_clk_probe(struct udevice *dev) clk_dm(IMX8MP_CLK_UART2_ROOT, imx_clk_gate4("uart2_root_clk", "uart2", base + 0x44a0, 0)); clk_dm(IMX8MP_CLK_UART3_ROOT, imx_clk_gate4("uart3_root_clk", "uart3", base + 0x44b0, 0)); clk_dm(IMX8MP_CLK_UART4_ROOT, imx_clk_gate4("uart4_root_clk", "uart4", base + 0x44c0, 0)); - clk_dm(IMX8MP_CLK_USB_ROOT, imx_clk_gate4("usb_root_clk", "usb_core_ref", base + 0x44d0, 0)); + clk_dm(IMX8MP_CLK_USB_ROOT, imx_clk_gate2("usb_root_clk", "hsio_axi", base + 0x44d0, 0)); + clk_dm(IMX8MP_CLK_USB_SUSP, imx_clk_gate2("usb_suspend_clk", "clock-osc-24m", base + 0x44d0, 0)); clk_dm(IMX8MP_CLK_USB_PHY_ROOT, imx_clk_gate4("usb_phy_root_clk", "usb_phy_ref", base + 0x44f0, 0)); clk_dm(IMX8MP_CLK_USDHC1_ROOT, imx_clk_gate4("usdhc1_root_clk", "usdhc1", base + 0x4510, 0)); clk_dm(IMX8MP_CLK_USDHC2_ROOT, imx_clk_gate4("usdhc2_root_clk", "usdhc2", base + 0x4520, 0)); diff --git a/include/dt-bindings/clock/imx8mp-clock.h b/include/dt-bindings/clock/imx8mp-clock.h index 9d5cc2ddde..3f28ce685f 100644 --- a/include/dt-bindings/clock/imx8mp-clock.h +++ b/include/dt-bindings/clock/imx8mp-clock.h @@ -324,8 +324,18 @@ #define IMX8MP_CLK_CLKOUT2_SEL 317 #define IMX8MP_CLK_CLKOUT2_DIV 318 #define IMX8MP_CLK_CLKOUT2 319 - -#define IMX8MP_CLK_END 320 +#define IMX8MP_CLK_USB_SUSP 320 +#define IMX8MP_CLK_AUDIO_AHB_ROOT IMX8MP_CLK_AUDIO_ROOT +#define IMX8MP_CLK_AUDIO_AXI_ROOT 321 +#define IMX8MP_CLK_SAI1_ROOT 322 +#define IMX8MP_CLK_SAI2_ROOT 323 +#define IMX8MP_CLK_SAI3_ROOT 324 +#define IMX8MP_CLK_SAI5_ROOT 325 +#define IMX8MP_CLK_SAI6_ROOT 326 +#define IMX8MP_CLK_SAI7_ROOT 327 +#define IMX8MP_CLK_PDM_ROOT 328 +#define IMX8MP_CLK_MEDIA_LDB_ROOT 329 +#define IMX8MP_CLK_END 330 #define IMX8MP_CLK_AUDIOMIX_SAI1_IPG 0 #define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1 1 -- 2.39.2

4 8

[PATCH v1 0/2] colibri-imx8x: snvs and firmware info
by Andrejs Cainikovs 12 Jul '23

12 Jul '23

This series updates recent Colibri iMX8X support refresh with following: * initialize secure non-volatile storage, aka snvs * print firmware versions during boot Andrejs Cainikovs (2): colibri-imx8x: print firmware versions board: colibri-imx8x: initialize snvs board/toradex/colibri-imx8x/colibri-imx8x.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.34.1

2 5

[PATCH] arm: dts: imx8mp-beacon-kit: Enable USB Power domains
by Adam Ford 12 Jul '23

12 Jul '23

The USB Power domains should not have been removed as it causes the board to hang if the USB is started. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi index 5ca631e9d8..b56f3a2bd2 100644 --- a/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi @@ -185,12 +185,10 @@ &usb3_0 { dma-ranges = <0x40000000 0x40000000 0xc0000000>; - /delete-property/ power-domains; }; &usb3_1 { dma-ranges = <0x40000000 0x40000000 0xc0000000>; - /delete-property/ power-domains; }; &usb_dwc3_0 { -- 2.39.2

3 2

[PATCH v2 0/5] imx8mn-var-som: fix ethernet for Variscite symphony board and imx8m nano SOM
by Hugo Villeneuve 12 Jul '23

12 Jul '23

From: Hugo Villeneuve <hvilleneuve(a)dimonoff.com> Hello, This patch series fixes bugs and add missing features related to the ethernet PHY on Variscite symphony carrier board with an imx8m nano SOM (P/N VAR-SOM-MX8M-NANO). Ethernet functionality is currently broken for the VAR-SOM-MX8M-NANO. Variscite imx8m nano SOM comes in multiple hardware configuration options. One of this hardware configuration option is called EC: EC: Ethernet Controller PHY assembled on SOM For SOM with the EC configuration, the ethernet PHY is located on the SOM itself, and connected to the CPU ethernet controller. It has a reset line controlled via GPIO1_IO9. In this configuration, the PHY located on the carrier board is not connected to anything and is therefore not used. For SOM without EC configuration, the ethernet PHY on the carrier board is connected to the CPU ethernet controller. It has a reset line controlled via the GPIO expander PCA9534_IO5. Patch 1 add code to read and display the SOM configuration stored in the SOM EEPROM. Part of this patch was submitted and accepted to the Linux kernel (section that adds the EEPROM to the device tree), so that it will be easier to sync the DT between kernel and U-Boot. Patch 2 fixes bugs with the PHY reset properties. Patch 3 fixes a bug with a missing PHY reset deassert delay (also submitted and accepted to kernel). Patch 4 enables automatic read of PHY MAC address from the SOM EEPROM. Patch 5 is used for auto-detecting at runtime the SOM hardware configuration option related to the PHY (EC), and dynamically adjust the device tree to support both SOM PHY options. I have succesfully tested the changes on a Variscite symphony carrier board with a VAR-SOM-MX8M-NANO having the EC configuration option. Unfortunately, I do not have a VAR-SOM-MX8M-NANO with a non-EC configuration option so I couldn't test it on real hardware, altough I simulated it and confirmed that the device tree fixing seems to be correct by using debug/print statements. Thank you. Link: [v1] https://lore.kernel.org/u-boot/20230501200121.3137519-1-hugo@hugovil.com/ Changes for V2: - Resend since I received 0 answers/comments after almost 4 weeks and I have a few minor updates to add: - Update defconfig using savedefconfig - Remove requirement about required patch (now in master) - Update status of patches also sent to the Linux kernel Hugo Villeneuve (5): imx8mn-var-som: read and print SoM infos from eeprom on startup imx8mn-var-som: fix non-applied PHY reset-gpios properties arm: dts: imx8mn-var-som: fix PHY detection bug by adding deassert delay imx8mn-var-som: read eth MAC address from EEPROM imx8mn-var-som: adjust PHY reset gpios according to hardware configuration .../dts/imx8mn-var-som-symphony-u-boot.dtsi | 17 ++ arch/arm/dts/imx8mn-var-som-symphony.dts | 4 - arch/arm/dts/imx8mn-var-som.dtsi | 18 +- arch/arm/mach-imx/imx8m/Kconfig | 4 + .../variscite/imx8mn_var_som/imx8mn_var_som.c | 214 ++++++++++++++++++ configs/imx8mn_var_som_defconfig | 4 + 6 files changed, 256 insertions(+), 5 deletions(-) base-commit: 62df7a39442902a71259568c13a4d496d5a514f4 -- 2.30.2

2 11

[PATCH v2 0/3] rpi: Convert to standard boot
by Simon Glass 11 Jul '23

11 Jul '23

This series moves Raspberry Pi boards over to use standard boot. It also moves rpi over to use a text-based environment. Unfortunately it is not possible to empty the header file due to several CFG options. Fix the repeated "and and" while we are here. Note that this reduces rodata size by about 4.5KB. We could get another for a total image-size saving of about 15KB. This is mostly because HUSH_PARSER is not enabled anymore and the environment shrinks down by about 3.5K. Hush is not actually needed anymore, since standard boot does not use it. Also CMD_SYSBOOT is dropped since standard boot calls the pxe_utils code directly in that case. Changes in v2: - Rebase to -next - Add new patch to disable DISTRO_DEFAULTS Simon Glass (3): arm: rpi: Switch to standard boot rpi: Disable DISTRO_DEFAULTS arm: rpi: Switch to a text environment board/raspberrypi/rpi/rpi.env | 77 +++++++++++++++++++ configs/rpi_0_w_defconfig | 2 +- configs/rpi_2_defconfig | 2 +- configs/rpi_3_32b_defconfig | 2 +- configs/rpi_3_b_plus_defconfig | 2 +- configs/rpi_3_defconfig | 2 +- configs/rpi_4_32b_defconfig | 2 +- configs/rpi_4_defconfig | 2 +- configs/rpi_arm64_defconfig | 2 +- configs/rpi_defconfig | 2 +- include/configs/rpi.h | 134 --------------------------------- 11 files changed, 86 insertions(+), 143 deletions(-) create mode 100644 board/raspberrypi/rpi/rpi.env -- 2.40.0.348.gf938b09366-goog

2 9

[PATCH v1 00/16] arm: xea: Update i.MX28 XEA board to use DM_SERIAL
by Lukasz Majewski 11 Jul '23

11 Jul '23

This patch series fixes i.MX28 based XEA board to utilize DM_SERIAL Changes: - Patches 1-3 - fix DTS (after Linux update) to debrick XEA - Patches 4-8 - prepare XEA's DTS to support DM_SERIAL - Patches 9-11 - fixes serial_pl01x.c driver (as this driver is used by XEA, I would prefer to have this in a single patchset - otherwise board may be bricked - Patches 12-14 - XEA and imx28 generic code fixes to support DM_SERIAL with OF_PLATDATA - Patches 15-16 - config modification to support DM_SERIAL CI: https://dev.azure.com/lukma633/U-Boot/_build/results?buildId=44&view=results Applied on top of u-boot/master branch SHA1: 6e1852ca2c418e2536ead4b51c4d84a59926b3f1 Lukasz Majewski (16): dts: xea: Delete not used in u-boot DTS nodes dts: xea: Provide missing FEC required properties (mac0 and reg_fec_3v3) defconfig: xea: Change default spi-nor memory bus to 2 spl: xea: Provide stub DM driver for imx28 clocks dts: xea: Enable debug UART support in XEA's SPL (DM_SERIAL) dts: xea: Add u-boot specific 'type' property to duart dts: xea: Remove clocks property from debug UART on XEA dts: xea: Disable 'clks' node for xea (imx287) serial: pl01x: Change OF_CONTROL to OF_REAL serial: pl01x: Prepare the driver to support SPL_OF_PLATDATA serial: pl01x: Modify pending callback to test if transmit FIFO is empty arm: mxs: Prevent serial console init when in very early SPL boot code arm: xea: Call spl_early_init() before DM serial console is enabled in SPL arm: Kconfig: Switch XEA (imx287 based) board to use CONFIG_PL01X_SERIAL config: xea: Enable DM_SERIAL for the XEA (imx287 based) board config: xea: Enable DM_SERIAL for the XEA - single binary (SB) u-boot arch/arm/Kconfig | 2 +- arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 6 ++-- arch/arm/dts/imx28-xea-u-boot.dtsi | 45 +++++++++++++++++++++++++ arch/arm/mach-imx/mxs/Kconfig | 1 + board/liebherr/xea/xea.c | 20 ++++++++++- configs/imx28_xea_defconfig | 5 +-- configs/imx28_xea_sb_defconfig | 2 ++ drivers/serial/serial_pl01x.c | 16 +++++++-- include/dm/platform_data/serial_pl01x.h | 4 +++ 9 files changed, 93 insertions(+), 8 deletions(-) -- 2.30.2

2 32