October 2023 - U-Boot

[PATCH 0/6] cmd mac: separate implementations
by Heinrich Schuchardt 16 Oct '23

16 Oct '23

There are three implementations of the 'mac' command: * Freescale (NXP) * SiFive Unmatched * StarFive VisionFive 2 They all use different sets of sub-commands and hence should display a different long text help. This series moves the command definition to the three implementations. The following fixes are added for the StarFive implementation: * Provide a hexdump if the data format is unknown. * Provide a raw sub-command to force a hexdump. Heinrich Schuchardt (6): cmd: move mac command freescale: fix long help handling in mac command eeprom: SiFive Unmatched: re-implement mac command eeprom: starfive: re-implement mac command eeprom: starfive: raw dump if unsupported data version eeprom: starfive: add 'mac raw' command board/freescale/common/sys_eeprom.c | 30 +++++++- .../unmatched/hifive-platform-i2c-eeprom.c | 30 +++++++- .../visionfive2/visionfive2-i2c-eeprom.c | 68 ++++++++++++------- cmd/Makefile | 1 - cmd/mac.c | 33 --------- 5 files changed, 98 insertions(+), 64 deletions(-) delete mode 100644 cmd/mac.c -- 2.40.1

2 13

[GIT PULL] Please pull u-boot-amlogic-20231015
by Neil Armstrong 16 Oct '23

16 Oct '23

Hi Tom, A set of changes mostly concerning Amlogic A1 & S4 SoCs for USB, Secure Monitor and RNG bringup. The CI job is at https://source.denx.de/u-boot/custodians/u-boot-amlogic/pipelines/18138 Thanks, Neil The following changes since commit 997bef3c6d22d12c7fd092fb831bf94d114c9f6f: Merge branch '2023-10-11-port-gen_compile_commands_py' (2023-10-11 13:25:01 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-amlogic.git tags/u-boot-amlogic-20231015 for you to fetch changes up to 7cd53e0d5203f8e25bb69d2e675769888fcbc754: arch: meson: use secure monitor driver (2023-10-15 12:23:48 +0200) ---------------------------------------------------------------- - add Amlogic A1 clock driver - add Amlogic A1 reset support - add USB Device support for Amlogic A1 - enable RNG on Amlogic A1 & Amlogic S4 - move Amlogic Secure Monitor to standalone driver ---------------------------------------------------------------- Alexey Romanov (18): dt-bindings: reset: add Meson A1 reset bindings reset: add support for Amlogic A1 family phy: get rid of raw hex values phy: move clk enable/disable in init/exit phy: support Amlogic A1 family dwc3: add support for Amlogic A1 family ad401: enable USB stack meson-a1: dts: add hw rng node meson-a1: dts: add ao secure node drivers: rng: add support for Meson S4 drivers: introduce Secure Monitor uclass sandbox: add sandbox sm uclass driver sandbox: dts: add meson secure monitor node sandbox: add tests for UCLASS_SM sandbox: defconfig: enable CONFIG_SM option drivers: introduce Meson Secure Monitor driver arch: meson: sm: set correct order of the includes arch: meson: use secure monitor driver Igor Prusov (3): dt-bindings: clock: Add Amlogic A1 clock bindings clk: Add clock driver for Amlogic A1 a1: clk: Add missing USB_PHY_IN and USB_PHY gates MAINTAINERS | 1 + arch/arm/dts/meson-a1.dtsi | 11 + arch/arm/include/asm/arch-meson/clock-a1.h | 23 + arch/arm/mach-meson/Kconfig | 1 + arch/arm/mach-meson/sm.c | 116 ++-- arch/sandbox/dts/test.dts | 4 + configs/ad401_defconfig | 3 + configs/sandbox_defconfig | 1 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/clk/meson/Kconfig | 8 + drivers/clk/meson/Makefile | 1 + drivers/clk/meson/a1.c | 729 +++++++++++++++++++++ drivers/phy/Kconfig | 2 +- drivers/phy/meson-g12a-usb2.c | 235 ++++++- drivers/reset/reset-meson.c | 42 +- drivers/rng/meson-rng.c | 72 +- drivers/sm/Kconfig | 9 + drivers/sm/Makefile | 5 + drivers/sm/meson-sm.c | 198 ++++++ drivers/sm/sandbox-sm.c | 76 +++ drivers/sm/sm-uclass.c | 55 ++ drivers/usb/dwc3/dwc3-meson-g12a.c | 79 ++- include/dm/uclass-id.h | 1 + .../clock/amlogic,a1-peripherals-clkc.h | 168 +++++ include/dt-bindings/clock/amlogic,a1-pll-clkc.h | 25 + include/dt-bindings/reset/amlogic,meson-a1-reset.h | 76 +++ include/meson/sm.h | 19 + include/sandbox-sm.h | 18 + include/sm-uclass.h | 72 ++ include/sm.h | 67 ++ test/dm/Makefile | 1 + test/dm/sm.c | 65 ++ 33 files changed, 2095 insertions(+), 91 deletions(-) create mode 100644 arch/arm/include/asm/arch-meson/clock-a1.h create mode 100644 drivers/clk/meson/a1.c create mode 100644 drivers/sm/Kconfig create mode 100644 drivers/sm/Makefile create mode 100644 drivers/sm/meson-sm.c create mode 100644 drivers/sm/sandbox-sm.c create mode 100644 drivers/sm/sm-uclass.c create mode 100644 include/dt-bindings/clock/amlogic,a1-peripherals-clkc.h create mode 100644 include/dt-bindings/clock/amlogic,a1-pll-clkc.h create mode 100644 include/dt-bindings/reset/amlogic,meson-a1-reset.h create mode 100644 include/meson/sm.h create mode 100644 include/sandbox-sm.h create mode 100644 include/sm-uclass.h create mode 100644 include/sm.h create mode 100644 test/dm/sm.c

2 1

[PATCH v2] pico-pi-imx7d: Unselect CONFIG_CONSOLE_MUX
by Fabio Estevam 16 Oct '23

16 Oct '23

From: Fabio Estevam <festevam(a)denx.de> Unselect CONFIG_CONSOLE_MUX to fix the following error for the input, output and error interfaces: U-Boot 2023.10 (Oct 03 2023 - 21:23:18 -0300) ... In: No input devices available! Out: No output devices available! Err: No error devices available! Net: eth0: ethernet@30be0000 Hit any key to stop autoboot: 0 Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- Changes since v1: - Apply for all pico-imx7 defconfigs. configs/pico-dwarf-imx7d_defconfig | 1 + configs/pico-hobbit-imx7d_defconfig | 1 + configs/pico-imx7d_bl33_defconfig | 1 + configs/pico-imx7d_defconfig | 1 + configs/pico-nymph-imx7d_defconfig | 1 + configs/pico-pi-imx7d_defconfig | 1 + 6 files changed, 6 insertions(+) diff --git a/configs/pico-dwarf-imx7d_defconfig b/configs/pico-dwarf-imx7d_defconfig index 2cd906a63da0..8a99b813daee 100644 --- a/configs/pico-dwarf-imx7d_defconfig +++ b/configs/pico-dwarf-imx7d_defconfig @@ -22,6 +22,7 @@ CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-dwarf.dtb" +# CONFIG_CONSOLE_MUX is not set CONFIG_SPL_MAX_SIZE=0xe000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y CONFIG_SPL_BSS_MAX_SIZE=0x100000 diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig index b63281e53322..9a51a958a686 100644 --- a/configs/pico-hobbit-imx7d_defconfig +++ b/configs/pico-hobbit-imx7d_defconfig @@ -22,6 +22,7 @@ CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb" +# CONFIG_CONSOLE_MUX is not set CONFIG_SPL_MAX_SIZE=0xe000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y CONFIG_SPL_BSS_MAX_SIZE=0x100000 diff --git a/configs/pico-imx7d_bl33_defconfig b/configs/pico-imx7d_bl33_defconfig index 546e1e6545d3..b5eedec82757 100644 --- a/configs/pico-imx7d_bl33_defconfig +++ b/configs/pico-imx7d_bl33_defconfig @@ -24,6 +24,7 @@ CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run distro_bootcmd" +# CONFIG_CONSOLE_MUX is not set CONFIG_SPL_MAX_SIZE=0xe000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y CONFIG_SPL_BSS_MAX_SIZE=0x100000 diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig index f11e1f4ef413..02af6533e37a 100644 --- a/configs/pico-imx7d_defconfig +++ b/configs/pico-imx7d_defconfig @@ -22,6 +22,7 @@ CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="ask" +# CONFIG_CONSOLE_MUX is not set CONFIG_SPL_MAX_SIZE=0xe000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y CONFIG_SPL_BSS_MAX_SIZE=0x100000 diff --git a/configs/pico-nymph-imx7d_defconfig b/configs/pico-nymph-imx7d_defconfig index 2cd906a63da0..8a99b813daee 100644 --- a/configs/pico-nymph-imx7d_defconfig +++ b/configs/pico-nymph-imx7d_defconfig @@ -22,6 +22,7 @@ CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-dwarf.dtb" +# CONFIG_CONSOLE_MUX is not set CONFIG_SPL_MAX_SIZE=0xe000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y CONFIG_SPL_BSS_MAX_SIZE=0x100000 diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig index 3e26aae40053..5b479818d88e 100644 --- a/configs/pico-pi-imx7d_defconfig +++ b/configs/pico-pi-imx7d_defconfig @@ -22,6 +22,7 @@ CONFIG_BOARD_SIZE_LIMIT=715776 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx7d-pico-pi.dtb" +# CONFIG_CONSOLE_MUX is not set CONFIG_SPL_MAX_SIZE=0xe000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y CONFIG_SPL_BSS_MAX_SIZE=0x100000 -- 2.34.1

2 1

[PATCH] arm64: dts: imx8mp: Make GPIO3 available early in U-Boot proper on i.MX8MP DHCOM
by sbabic＠denx.de 16 Oct '23

16 Oct '23

> The GPIO3 has to be available early during U-Boot proper start up for > DRAM size detect to work correctly. The GPIO3 is currently available in > SPL and late in U-Boot proper, which is insufficient. Add the missing > bootph-all to make the GPIO3 available also early in U-Boot proper. > Signed-off-by: Marek Vasut <marex(a)denx.de> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[PATCH] mxs: Kconfig: Remove TARGET_XFI3 symbol
by Fabio Estevam 16 Oct '23

16 Oct '23

From: Fabio Estevam <festevam(a)denx.de> The xfi3 target has been removed by commit 539fba2c10e7 ("arm: Remove xfi3 board"), but it missed to remove an entry from the mxs Kconfig. Remove it. Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- arch/arm/mach-imx/mxs/Kconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm/mach-imx/mxs/Kconfig b/arch/arm/mach-imx/mxs/Kconfig index d3233d8d14f3..ccce6a78caa2 100644 --- a/arch/arm/mach-imx/mxs/Kconfig +++ b/arch/arm/mach-imx/mxs/Kconfig @@ -18,9 +18,6 @@ config TARGET_MX23EVK select PL01X_SERIAL select BOARD_EARLY_INIT_F -config TARGET_XFI3 - bool "Support xfi3" - endchoice config SYS_SOC -- 2.34.1

2 1

[PATCH 4/4] arm: dts: imx93-evk: remove wrong eqos compatible string
by sbabic＠denx.de 16 Oct '23

16 Oct '23

> The correct compatible string for i.MX93 variant of DWC EQoS MAC is now > "nxp,imx93-dwmac-eqos". > Signed-off-by: Sébastien Szymanski <sebastien.szymanski(a)armadeus.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[PATCH 1/4] clk: imx: add i.MX93 CCF driver
by sbabic＠denx.de 16 Oct '23

16 Oct '23

> Add i.MX93 CCF driver support. > Modifed from Linux Kernel v6.5-rc2 and adapted for U-Boot. > Signed-off-by: Sébastien Szymanski <sebastien.szymanski(a)armadeus.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[PATCH 1/5] spl: fit: Add board level function to decide application of DTO
by Marek Vasut 16 Oct '23

16 Oct '23

Add board-specific function used to indicate whether a DTO from fitImage configuration node 'fdt' property DT and DTO list should be applied onto the base DT or not applied. This is useful in case of DTOs which implement e.g. different board revision details, where such DTO should be applied on one board revision, and should not be applied on another board revision. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: "NXP i.MX U-Boot Team" <uboot-imx(a)nxp.com> Cc: Algapally Santosh Sagar <santoshsagar.algapally(a)amd.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Mayuresh Chitale <mchitale(a)ventanamicro.com> Cc: Oleksandr Suvorov <oleksandr.suvorov(a)foundries.io> Cc: Ovidiu Panait <ovpanait(a)gmail.com> Cc: Roger Quadros <rogerq(a)kernel.org> Cc: Simon Glass <sjg(a)chromium.org> Cc: Stefano Babic <sbabic(a)denx.de> Cc: u-boot(a)dh-electronics.com --- common/spl/spl_fit.c | 23 ++++++++++++++++++++--- include/spl.h | 16 ++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 730639f7562..ed91ddd6b40 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -357,6 +357,11 @@ static bool os_takes_devicetree(uint8_t os) } } +__weak int board_spl_fit_append_fdt_skip(const char *name) +{ + return 0; /* Do not skip */ +} + static int spl_fit_append_fdt(struct spl_image_info *spl_image, struct spl_load_info *info, ulong sector, const struct spl_fit_info *ctx) @@ -400,11 +405,23 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image, void *tmpbuffer = NULL; for (; ; index++) { - node = spl_fit_get_image_node(ctx, FIT_FDT_PROP, index); - if (node == -E2BIG) { + const char *str; + + ret = spl_fit_get_image_name(ctx, FIT_FDT_PROP, index, &str); + if (ret == -E2BIG) { debug("%s: No additional FDT node\n", __func__); + ret = 0; break; - } else if (node < 0) { + } else if (ret < 0) { + continue; + } + + ret = board_spl_fit_append_fdt_skip(str); + if (ret) + continue; + + node = fdt_subnode_offset(ctx->fit, ctx->images_node, str); + if (node < 0) { debug("%s: unable to find FDT node %d\n", __func__, index); continue; diff --git a/include/spl.h b/include/spl.h index 92bcaa90a4a..60a432c4b15 100644 --- a/include/spl.h +++ b/include/spl.h @@ -895,6 +895,22 @@ void spl_perform_fixups(struct spl_image_info *spl_image); */ struct legacy_img_hdr *spl_get_load_buffer(ssize_t offset, size_t size); +/** + * board_spl_fit_append_fdt_skip(): test whether DTO application should be skipped + * @name: DTO node name within fitImage images node + * + * A board-specific function used to indicate whether a DTO from fitImage + * configuration node 'fdt' property DT and DTO list should be applied onto + * the base DT or not applied. + * + * This is useful in case of DTOs which implement e.g. different board revision + * details, where such DTO should be applied on one board revision, and should + * not be applied on another board revision. + * + * Return: 0 to indicate DTO is not skipped, all else to indicate DTO is skipped. + */ +int board_spl_fit_append_fdt_skip(const char *name); + void board_boot_order(u32 *spl_boot_list); void spl_save_restore_data(void); #endif -- 2.40.1

2 9

[PATCH] imx: hab: Use size parameter
by Marek Vasut 16 Oct '23

16 Oct '23

The current code works by sheer coincidence, because (see HABv4 API documentation, section 3.4) the RVT authenticate_image call updates the size that is passed in with the actual size ROM code pulls from IVT/CSF . So if the input size is larger, that is "fine" . Pass in size instead to make this really correct. Signed-off-by: Marek Vasut <marex(a)denx.de> --- NOTE: Rasmus, can you please double-check this one ? Thanks --- Cc: "NXP i.MX U-Boot Team" <uboot-imx(a)nxp.com> Cc: Fabio Estevam <festevam(a)denx.de> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Tim Harvey <tharvey(a)gateworks.com> --- arch/arm/mach-imx/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 6c13b00ef10..b30cd962553 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -353,7 +353,7 @@ void *spl_load_simple_fit_fix_load(const void *fit) debug("%s: ivt: %p offset: %lx size: %lx\n", __func__, ivt, offset, size); debug("%s: ivt self: %x\n", __func__, ivt->self); - if (imx_hab_authenticate_image((uintptr_t)fit, (uintptr_t)ivt, offset)) + if (imx_hab_authenticate_image((uintptr_t)fit, (uintptr_t)size, offset)) panic("spl: ERROR: image authentication unsuccessful\n"); return (void *)fit; -- 2.40.1

2 1

[PATCH 1/4] net: dwc_eth_qos: add i.MX93 support
by sbabic＠denx.de 16 Oct '23

16 Oct '23

> Add support for DWC EQoS MAC on i.MX93. > Signed-off-by: Sébastien Szymanski <sebastien.szymanski(a)armadeus.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0