January 2025 - U-Boot

Guidance on Building a Lightweight and Updated System for PX30 Board
by Hossein Majidi 21 Jan '25

21 Jan '25

Hello, I have a board from the company 9Tripod with a Rockchip PX30 (X30) processor. The source code provided by the company includes U-Boot version 2017.09 and kernel 4.4.194, which are outdated, unstable, and heavy. Therefore, I decided to build a lightweight, stable, and updated Debian-based operating system with a newer U-Boot and kernel for this board. To achieve this, I tried using the source code of similar boards that also use the PX30 processor. Unfortunately, none of those boards could boot after compiling U-Boot and deploying it on my board. The only board whose U-Boot booted successfully was *Ringneck-px30*, (However I had to change its Ram config to DDR3 cause my 9tripod px30 board is DDR3 and theirs is DDR4) but it still had several issues: 1. During the boot process, I encountered the error: *"No Ethernet Found."* 2. Any changes made to the Device Tree for the PMIC unit were not applied, even after recompilation and flashing. 3. I attempted to remove the SD Card as a boot target and rely solely on eMMC, but this change was ineffective, and the board still behaved as before. My goal is to create a lightweight and updated operating system with the following features: - Proper functioning of *networking* (Network chip: Realtek) - Support for *RGB888 Display* and *LVDS* - Support for *SPI, I2C, USART, USB OTG, and eMMC (without SD Card)* - Support for *RTC and CAN* - Exclusion of *Camera, Sound, PCIe, Wi-Fi, and MIPI* The most critical requirement is that both U-Boot and the kernel are updated and modern. I would greatly appreciate your guidance on how to proceed with this task and achieve my goal. Any suggestions or resources that might help would be incredibly valuable. Thank you in advance, Hossein

1 0

[PATCH] arm64: zynqmp: enable u-boot itb generation via binman if SPL is enabled
by Michal Simek 21 Jan '25

21 Jan '25

From: Prasad Kummari <prasad.kummari(a)amd.com> Output images are generated via Binman only if SPL is enabled, as there is no consumer for them otherwise. An #ifdef check ensures that when SPL is enabled, Binman generates the U-Boot ITB. If SPL is disabled, ITB generation is skipped since the ITB format is supported only by SPL. Without SPL, generating such an image is unnecessary, as it would not be used The second reason is that when a DTB is passed, the current logic cannot handle it without an additional step in U-Boot to parse an appended FIT image and enable board-specific code to select the correct DTB config. The MULTI_DTB_FIT configuration should be used if support for multiple DTBs is required, but SPL is not being used. Signed-off-by: Prasad Kummari <prasad.kummari(a)amd.com> Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- arch/arm/dts/zynqmp-binman-som.dts | 3 +++ arch/arm/dts/zynqmp-binman.dts | 2 ++ 2 files changed, 5 insertions(+) diff --git a/arch/arm/dts/zynqmp-binman-som.dts b/arch/arm/dts/zynqmp-binman-som.dts index 3d9d8476c98e..3ffa06f0c04f 100644 --- a/arch/arm/dts/zynqmp-binman-som.dts +++ b/arch/arm/dts/zynqmp-binman-som.dts @@ -13,6 +13,8 @@ / { binman: binman { multiple-images; + +#ifdef CONFIG_SPL fit-dtb.blob { filename = "fit-dtb.blob"; pad-byte = <0>; @@ -220,6 +222,7 @@ fdtmap { }; }; +#endif #endif }; }; diff --git a/arch/arm/dts/zynqmp-binman.dts b/arch/arm/dts/zynqmp-binman.dts index 675f6bf51ebd..bf3335a3e539 100644 --- a/arch/arm/dts/zynqmp-binman.dts +++ b/arch/arm/dts/zynqmp-binman.dts @@ -14,6 +14,7 @@ binman: binman { multiple-images; +#ifdef CONFIG_SPL /* u-boot.itb generation in a static way */ itb { filename = "u-boot.itb"; @@ -201,6 +202,7 @@ fdtmap { }; }; +#endif #endif }; }; -- 2.43.0

1 0

[PATCH] net: ravb: Staticize bb_miiphy functions
by Marek Vasut 21 Jan '25

21 Jan '25

These functions can be static as they are referenced only in this file. Make them static. No functional change. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Adam Ford <aford173(a)gmail.com> Cc: Hai Pham <hai.pham.ud(a)renesas.com> Cc: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Cc: Jerome Forissier <jerome.forissier(a)linaro.org> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Mario Six <mario.six(a)gdsys.cc> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> Cc: Paul Barker <paul.barker.ct(a)bp.renesas.com> Cc: Peter Robinson <pbrobinson(a)gmail.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> Cc: Sumit Garg <sumit.garg(a)linaro.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)lists.denx.de --- drivers/net/ravb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index 231764e60b5..7286ad19598 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -560,12 +560,12 @@ static int ravb_remove(struct udevice *dev) return 0; } -int ravb_bb_init(struct bb_miiphy_bus *bus) +static int ravb_bb_init(struct bb_miiphy_bus *bus) { return 0; } -int ravb_bb_mdio_active(struct bb_miiphy_bus *bus) +static int ravb_bb_mdio_active(struct bb_miiphy_bus *bus) { struct ravb_priv *eth = bus->priv; @@ -574,7 +574,7 @@ int ravb_bb_mdio_active(struct bb_miiphy_bus *bus) return 0; } -int ravb_bb_mdio_tristate(struct bb_miiphy_bus *bus) +static int ravb_bb_mdio_tristate(struct bb_miiphy_bus *bus) { struct ravb_priv *eth = bus->priv; @@ -583,7 +583,7 @@ int ravb_bb_mdio_tristate(struct bb_miiphy_bus *bus) return 0; } -int ravb_bb_set_mdio(struct bb_miiphy_bus *bus, int v) +static int ravb_bb_set_mdio(struct bb_miiphy_bus *bus, int v) { struct ravb_priv *eth = bus->priv; @@ -595,7 +595,7 @@ int ravb_bb_set_mdio(struct bb_miiphy_bus *bus, int v) return 0; } -int ravb_bb_get_mdio(struct bb_miiphy_bus *bus, int *v) +static int ravb_bb_get_mdio(struct bb_miiphy_bus *bus, int *v) { struct ravb_priv *eth = bus->priv; @@ -604,7 +604,7 @@ int ravb_bb_get_mdio(struct bb_miiphy_bus *bus, int *v) return 0; } -int ravb_bb_set_mdc(struct bb_miiphy_bus *bus, int v) +static int ravb_bb_set_mdc(struct bb_miiphy_bus *bus, int v) { struct ravb_priv *eth = bus->priv; @@ -616,7 +616,7 @@ int ravb_bb_set_mdc(struct bb_miiphy_bus *bus, int v) return 0; } -int ravb_bb_delay(struct bb_miiphy_bus *bus) +static int ravb_bb_delay(struct bb_miiphy_bus *bus) { udelay(10); -- 2.45.2

2 1

[PATCH] net: miiphybb: configs: Drop CONFIG_BITBANGMII_MULTI
by Marek Vasut 21 Jan '25

21 Jan '25

It seems that every remaining system which enables BITBANGMII also enables BITBANGMII_MULTI . Remove the BITBANGMII_MULTI symbol and assume it is always enabled. This allows removal of a bit of legacy code. No functional change intended. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Adam Ford <aford173(a)gmail.com> Cc: Hai Pham <hai.pham.ud(a)renesas.com> Cc: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Cc: Jerome Forissier <jerome.forissier(a)linaro.org> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Mario Six <mario.six(a)gdsys.cc> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> Cc: Paul Barker <paul.barker.ct(a)bp.renesas.com> Cc: Peter Robinson <pbrobinson(a)gmail.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> Cc: Sumit Garg <sumit.garg(a)linaro.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)lists.denx.de --- configs/alt_defconfig | 1 - configs/controlcenterdc_defconfig | 1 - configs/gose_defconfig | 1 - configs/grpeach_defconfig | 1 - configs/koelsch_defconfig | 1 - configs/lager_defconfig | 1 - configs/porter_defconfig | 1 - configs/r8a779a0_falcon_defconfig | 1 - configs/r8a779g0_whitehawk_defconfig | 1 - configs/r8a779h0_grayhawk_defconfig | 1 - configs/renesas_rcar3.config | 1 - configs/silk_defconfig | 1 - configs/stout_defconfig | 1 - doc/README.bitbangMII | 25 ++------ drivers/net/phy/Kconfig | 4 -- drivers/net/phy/miiphybb.c | 89 ---------------------------- include/miiphy.h | 2 - 17 files changed, 4 insertions(+), 129 deletions(-) diff --git a/configs/alt_defconfig b/configs/alt_defconfig index 488115d9a5c..7b16923e34d 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -38,7 +38,6 @@ CONFIG_SH_MMCIF=y CONFIG_DM_MTD=y CONFIG_SPI_FLASH_MTD=y CONFIG_BITBANGMII=y -CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y CONFIG_SH_ETHER=y diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index 2d6c83a5d5f..e6242e22509 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -85,7 +85,6 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_MV=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_BITBANGMII=y -CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_ANEG_TIMEOUT=8000 CONFIG_PHY_MARVELL=y CONFIG_PHY_GIGE=y diff --git a/configs/gose_defconfig b/configs/gose_defconfig index d212f91bf83..b53f2f37409 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -36,7 +36,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k CONFIG_DM_MTD=y CONFIG_SPI_FLASH_MTD=y CONFIG_BITBANGMII=y -CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y CONFIG_SH_ETHER=y diff --git a/configs/grpeach_defconfig b/configs/grpeach_defconfig index a4005438c19..d2cc1cf7981 100644 --- a/configs/grpeach_defconfig +++ b/configs/grpeach_defconfig @@ -52,7 +52,6 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_BITBANGMII=y -CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_SMSC=y CONFIG_DM_ETH_PHY=y CONFIG_SH_ETHER=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index 9bce9e33104..eeb97474b2a 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -36,7 +36,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k CONFIG_DM_MTD=y CONFIG_SPI_FLASH_MTD=y CONFIG_BITBANGMII=y -CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y CONFIG_SH_ETHER=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index 0d4eed0ddf7..b5682526c8c 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -38,7 +38,6 @@ CONFIG_SH_MMCIF=y CONFIG_DM_MTD=y CONFIG_SPI_FLASH_MTD=y CONFIG_BITBANGMII=y -CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y CONFIG_SH_ETHER=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index 98a67bee3e0..cb18024da12 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -36,7 +36,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k CONFIG_DM_MTD=y CONFIG_SPI_FLASH_MTD=y CONFIG_BITBANGMII=y -CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y CONFIG_SH_ETHER=y diff --git a/configs/r8a779a0_falcon_defconfig b/configs/r8a779a0_falcon_defconfig index aae4406bf04..f4f5c57451f 100644 --- a/configs/r8a779a0_falcon_defconfig +++ b/configs/r8a779a0_falcon_defconfig @@ -17,7 +17,6 @@ CONFIG_DEFAULT_FDT_FILE="r8a779a0-falcon.dtb" CONFIG_SYS_PBSIZE=2068 CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_BITBANGMII=y -CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_RENESAS_RAVB=y diff --git a/configs/r8a779g0_whitehawk_defconfig b/configs/r8a779g0_whitehawk_defconfig index c74051d1af9..b49a81dcd49 100644 --- a/configs/r8a779g0_whitehawk_defconfig +++ b/configs/r8a779g0_whitehawk_defconfig @@ -19,7 +19,6 @@ CONFIG_SYS_CBSIZE=2048 CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_MMC_ENV_PART=2 CONFIG_BITBANGMII=y -CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_RENESAS_RAVB=y diff --git a/configs/r8a779h0_grayhawk_defconfig b/configs/r8a779h0_grayhawk_defconfig index ef709214f03..5b9ad93a596 100644 --- a/configs/r8a779h0_grayhawk_defconfig +++ b/configs/r8a779h0_grayhawk_defconfig @@ -16,7 +16,6 @@ CONFIG_SYS_CBSIZE=2048 CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_MMC_ENV_PART=2 CONFIG_BITBANGMII=y -CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_RENESAS_RAVB=y diff --git a/configs/renesas_rcar3.config b/configs/renesas_rcar3.config index 7f7fab7df1d..9f2413ae928 100644 --- a/configs/renesas_rcar3.config +++ b/configs/renesas_rcar3.config @@ -1,5 +1,4 @@ #include <configs/renesas_rcar64.config> CONFIG_BITBANGMII=y -CONFIG_BITBANGMII_MULTI=y CONFIG_SYS_PBSIZE=2068 diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 53597e9dd4d..1c70a16bf5b 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -38,7 +38,6 @@ CONFIG_SH_MMCIF=y CONFIG_DM_MTD=y CONFIG_SPI_FLASH_MTD=y CONFIG_BITBANGMII=y -CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y CONFIG_SH_ETHER=y diff --git a/configs/stout_defconfig b/configs/stout_defconfig index a25a5627c2c..59bb7075013 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -36,7 +36,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k CONFIG_DM_MTD=y CONFIG_SPI_FLASH_MTD=y CONFIG_BITBANGMII=y -CONFIG_BITBANGMII_MULTI=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y CONFIG_SH_ETHER=y diff --git a/doc/README.bitbangMII b/doc/README.bitbangMII index 0a2fa48a56f..05ab20376f3 100644 --- a/doc/README.bitbangMII +++ b/doc/README.bitbangMII @@ -7,28 +7,11 @@ The driver requires that the following macros should be defined into the board configuration file: CONFIG_BITBANGMII - Enable the miiphybb driver -CONFIG_BITBANGMII_MULTI - Enable the multi bus support -If the CONFIG_BITBANGMII_MULTI is not defined, the board's config file needs -to define at least the following macros: - -MII_INIT - Generic code to enable the MII bus (optional) -MDIO_DECLARE - Declaration needed to access to the MDIO pin (optional) -MDIO_ACTIVE - Activate the MDIO pin as out pin -MDIO_TRISTATE - Activate the MDIO pin as input/tristate pin -MDIO_READ - Read the MDIO pin -MDIO(v) - Write v on the MDIO pin -MDC_DECLARE - Declaration needed to access to the MDC pin (optional) -MDC(v) - Write v on the MDC pin - -The previous macros make the driver compatible with the previous version -(that didn't support the multi-bus). - -When the CONFIG_BITBANGMII_MULTI is also defined, the board code needs to fill -the bb_miiphy_buses[] array with a record for each required bus and declare -the bb_miiphy_buses_num variable with the number of mii buses. -The record (struct bb_miiphy_bus) has the following fields/callbacks (see -miiphy.h for details): +The board code needs to fill the bb_miiphy_buses[] array with a record for +each required bus and declare the bb_miiphy_buses_num variable with the +number of mii buses. The record (struct bb_miiphy_bus) has the following +fields/callbacks (see miiphy.h for details): char name[] - The symbolic name that must be equal to the MII bus registered name diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 13e73810ad6..3132718e4f8 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -2,10 +2,6 @@ config BITBANGMII bool "Bit-banged ethernet MII management channel support" -config BITBANGMII_MULTI - bool "Enable the multi bus support" - depends on BITBANGMII - config MV88E6352_SWITCH bool "Marvell 88E6352 switch support" diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c index b143137893f..171c1719b5b 100644 --- a/drivers/net/phy/miiphybb.c +++ b/drivers/net/phy/miiphybb.c @@ -17,90 +17,6 @@ #include <miiphy.h> #include <asm/global_data.h> -#ifndef CONFIG_BITBANGMII_MULTI - -/* - * If CONFIG_BITBANGMII_MULTI is not defined we use a - * compatibility layer with the previous miiphybb implementation - * based on macros usage. - * - */ -static int bb_mii_init_wrap(struct bb_miiphy_bus *bus) -{ -#ifdef MII_INIT - MII_INIT; -#endif - return 0; -} - -static int bb_mdio_active_wrap(struct bb_miiphy_bus *bus) -{ -#ifdef MDIO_DECLARE - MDIO_DECLARE; -#endif - MDIO_ACTIVE; - return 0; -} - -static int bb_mdio_tristate_wrap(struct bb_miiphy_bus *bus) -{ -#ifdef MDIO_DECLARE - MDIO_DECLARE; -#endif - MDIO_TRISTATE; - return 0; -} - -static int bb_set_mdio_wrap(struct bb_miiphy_bus *bus, int v) -{ -#ifdef MDIO_DECLARE - MDIO_DECLARE; -#endif - MDIO(v); - return 0; -} - -static int bb_get_mdio_wrap(struct bb_miiphy_bus *bus, int *v) -{ -#ifdef MDIO_DECLARE - MDIO_DECLARE; -#endif - *v = MDIO_READ; - return 0; -} - -static int bb_set_mdc_wrap(struct bb_miiphy_bus *bus, int v) -{ -#ifdef MDC_DECLARE - MDC_DECLARE; -#endif - MDC(v); - return 0; -} - -static int bb_delay_wrap(struct bb_miiphy_bus *bus) -{ - MIIDELAY; - return 0; -} - -struct bb_miiphy_bus bb_miiphy_buses[] = { - { - .name = BB_MII_DEVNAME, - .init = bb_mii_init_wrap, - .mdio_active = bb_mdio_active_wrap, - .mdio_tristate = bb_mdio_tristate_wrap, - .set_mdio = bb_set_mdio_wrap, - .get_mdio = bb_get_mdio_wrap, - .set_mdc = bb_set_mdc_wrap, - .delay = bb_delay_wrap, - } -}; - -int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) / - sizeof(bb_miiphy_buses[0]); -#endif - int bb_miiphy_init(void) { int i; @@ -114,7 +30,6 @@ int bb_miiphy_init(void) static inline struct bb_miiphy_bus *bb_miiphy_getbus(const char *devname) { -#ifdef CONFIG_BITBANGMII_MULTI int i; /* Search the correct bus */ @@ -124,10 +39,6 @@ static inline struct bb_miiphy_bus *bb_miiphy_getbus(const char *devname) } } return NULL; -#else - /* We have just one bitbanging bus */ - return &bb_miiphy_buses[0]; -#endif } /***************************************************************************** diff --git a/include/miiphy.h b/include/miiphy.h index 5abffd8fb6b..2bb4f62ea76 100644 --- a/include/miiphy.h +++ b/include/miiphy.h @@ -72,9 +72,7 @@ struct bb_miiphy_bus { int (*get_mdio)(struct bb_miiphy_bus *bus, int *v); int (*set_mdc)(struct bb_miiphy_bus *bus, int v); int (*delay)(struct bb_miiphy_bus *bus); -#ifdef CONFIG_BITBANGMII_MULTI void *priv; -#endif }; extern struct bb_miiphy_bus bb_miiphy_buses[]; -- 2.45.2

2 1

[PATCH RFC v2] image: apply FDTOs on FDT image node without a load property
by Quentin Schulz 21 Jan '25

21 Jan '25

From: Quentin Schulz <quentin.schulz(a)cherry.de> A FIT image which is NOT using -E when created by mkimage - that is with image data within the FIT - will fail to apply FDTO if the base FDT image node does not specify a load property (which points to an address in DRAM). This is because we check that the FDT address we want to apply overlay to (i.e. modify and likely increase in size) is not inside the FIT and give up otherwise. This is assumed necessary because we may then overwrite other data when applying in-place. However, we can do better than giving up: relocating the FDT in another place in DRAM where it's safe to increase its size and apply FDTOs. While at it, do not discriminate anymore on whether the data is within the FIT data address space - that is FIT images created with mkimage -E - as that still may be susceptible to unintended data overwrites as mkimage -E simply concatenates all blobs after the FIT. If the FDT blob isn't the last, it'll result in overwriting later blobs when resizing. The side effect is that the load property in the FIT is only temporarily used to load the FDT but then relocated right before we start applying overlays. Suggested-by: Marek Vasut <marex(a)denx.de> Signed-off-by: Quentin Schulz <quentin.schulz(a)cherry.de> --- This actually forces the base FDT to always be relocated whenever FDTO are expected to be applied, regardless of the presence of the load property in the base FDT image node. Tested with extlinux with: - conf node with multiple fdt entries (scenario A) - conf node with base fdt + conf node with fdto (stored in fdt property) (scenario B) - conf node with multiple fdt entries with base fdt with load property (scenario C) - conf node with base fdt + conf node with fdto (stored in fdt property) with base fdt with load property (scenario D) """fit.its /dts-v1/; / { description = "Kernel fitImage for Jaguar"; #address-cells = <1>; images { kernel-1 { description = "Linux kernel"; data = /incbin/("arch/arm64/boot/Image.gz"); type = "kernel"; arch = "arm64"; os = "linux"; compression = "gzip"; load = <0x06000000>; entry = <0x06000000>; hash-1 { algo = "sha256"; }; }; fdt-rk3588-jaguar.dtb { description = "Flattened Device Tree blob"; data = /incbin/("arch/arm64/boot/dts/rockchip/rk3588-jaguar.dtb"); type = "flat_dt"; arch = "arm64"; compression = "none"; hash-1 { algo = "sha256"; }; }; fdt-rk3588-jaguar.dtb-load { description = "Flattened Device Tree blob"; data = /incbin/("arch/arm64/boot/dts/rockchip/rk3588-jaguar.dtb"); type = "flat_dt"; arch = "arm64"; compression = "none"; load = <0x12000000>; hash-1 { algo = "sha256"; }; }; fdt-rk3588-jaguar-pre-ict-tester.dtbo { description = "Flattened Device Tree blob"; data = /incbin/("arch/arm64/boot/dts/rockchip/rk3588-jaguar-pre-ict-tester.dtbo"); type = "flat_dt"; arch = "arm64"; compression = "none"; hash-1 { algo = "sha256"; }; }; }; configurations { default = "conf-rk3588-jaguar.dtb"; conf-rk3588-jaguar.dtb { description = "1 Linux kernel, FDT blob"; kernel = "kernel-1"; fdt = "fdt-rk3588-jaguar.dtb"; hash-1 { algo = "sha256"; }; }; conf-rk3588-jaguar.dtb-and-dtbo { description = "1 Linux kernel, FDT blob"; kernel = "kernel-1"; fdt = "fdt-rk3588-jaguar.dtb", "fdt-rk3588-jaguar-pre-ict-tester.dtbo"; hash-1 { algo = "sha256"; }; }; conf-rk3588-jaguar.dtb-load { description = "1 Linux kernel, FDT blob"; kernel = "kernel-1"; fdt = "fdt-rk3588-jaguar.dtb-load"; hash-1 { algo = "sha256"; }; }; conf-rk3588-jaguar.dtb-load-and-dtbo { description = "1 Linux kernel, FDT blob"; kernel = "kernel-1"; fdt = "fdt-rk3588-jaguar.dtb-load", "fdt-rk3588-jaguar-pre-ict-tester.dtbo"; hash-1 { algo = "sha256"; }; }; conf-rk3588-jaguar-pre-ict-tester.dtbo { description = "0 FDT blob"; fdt = "fdt-rk3588-jaguar-pre-ict-tester.dtbo"; hash-1 { algo = "sha256"; }; }; }; }; """ """extlinux.conf (scenario A) LABEL rk3588-jaguar LINUX /boot/fit#conf-rk3588-jaguar.dtb-and-dtbo APPEND root=PARTLABEL=debos-rootfs rw rootwait net.ifnames=0 """ Log: """ Using 'conf-rk3588-jaguar.dtb-and-dtbo' configuration Verifying Hash Integrity ... OK Trying 'kernel-1' kernel subimage Description: Linux kernel Type: Kernel Image Compression: gzip compressed Data Start: 0x020000cc Data Size: 11862415 Bytes = 11.3 MiB Architecture: AArch64 OS: Linux Load Address: 0x06000000 Entry Point: 0x06000000 Hash algo: sha256 Hash value: 51a2b828aec49d9ede09a2de2cd05226def258dedcc8e4c4098fa2ba38fb9690 Verifying Hash Integrity ... sha256+ OK Using 'conf-rk3588-jaguar.dtb-and-dtbo' configuration Verifying Hash Integrity ... OK Trying 'fdt-rk3588-jaguar.dtb' fdt subimage Description: Flattened Device Tree blob Type: Flat Device Tree Compression: uncompressed Data Start: 0x02b50370 Data Size: 168750 Bytes = 164.8 KiB Architecture: AArch64 Hash algo: sha256 Hash value: 96213ce3930a5f926b27c90671ca779fc327e2e62c2135f7ed7d8b6dd659b973 Verifying Hash Integrity ... sha256+ OK Loading Device Tree to 00000000ece9d000, end 00000000ecec9fff ... OK Working FDT set to ece9d000 Trying 'fdt-rk3588-jaguar-pre-ict-tester.dtbo' fdt subimage Description: Flattened Device Tree blob Type: Flat Device Tree Compression: uncompressed Data Start: 0x02ba2bb4 Data Size: 2753 Bytes = 2.7 KiB Architecture: AArch64 Hash algo: sha256 Hash value: e5eb1fe225d03b04e9bb27c04fe3278f294b48c6ab6757292c9650f6d3ce9f34 Verifying Hash Integrity ... sha256+ OK Booting using the fdt blob at 0xece9d000 Working FDT set to ece9d000 Uncompressing Kernel Image to 6000000 Loading Device Tree to 00000000ece70000, end 00000000ece9c62d ... OK Working FDT set to ece70000 """ """extlinux.conf (scenario B) LABEL rk3588-jaguar LINUX /boot/fit#conf-rk3588-jaguar.dtb-load-and-dtbo APPEND root=PARTLABEL=debos-rootfs rw rootwait net.ifnames=0 """ Log: """ Using 'conf-rk3588-jaguar.dtb-load-and-dtbo' configuration Verifying Hash Integrity ... OK Trying 'kernel-1' kernel subimage Description: Linux kernel Type: Kernel Image Compression: gzip compressed Data Start: 0x020000cc Data Size: 11862415 Bytes = 11.3 MiB Architecture: AArch64 OS: Linux Load Address: 0x06000000 Entry Point: 0x06000000 Hash algo: sha256 Hash value: 51a2b828aec49d9ede09a2de2cd05226def258dedcc8e4c4098fa2ba38fb9690 Verifying Hash Integrity ... sha256+ OK Using 'conf-rk3588-jaguar.dtb-load-and-dtbo' configuration Verifying Hash Integrity ... OK Trying 'fdt-rk3588-jaguar.dtb-load' fdt subimage Description: Flattened Device Tree blob Type: Flat Device Tree Compression: uncompressed Data Start: 0x02b79784 Data Size: 168750 Bytes = 164.8 KiB Architecture: AArch64 Load Address: 0x12000000 Hash algo: sha256 Hash value: 96213ce3930a5f926b27c90671ca779fc327e2e62c2135f7ed7d8b6dd659b973 Verifying Hash Integrity ... sha256+ OK Loading fdt from 0x02b79784 to 0x12000000 Loading Device Tree to 00000000ece9d000, end 00000000ecec9fff ... OK Working FDT set to ece9d000 Trying 'fdt-rk3588-jaguar-pre-ict-tester.dtbo' fdt subimage Description: Flattened Device Tree blob Type: Flat Device Tree Compression: uncompressed Data Start: 0x02ba2bb4 Data Size: 2753 Bytes = 2.7 KiB Architecture: AArch64 Hash algo: sha256 Hash value: e5eb1fe225d03b04e9bb27c04fe3278f294b48c6ab6757292c9650f6d3ce9f34 Verifying Hash Integrity ... sha256+ OK Booting using the fdt blob at 0xece9d000 Working FDT set to ece9d000 Uncompressing Kernel Image to 6000000 Loading Device Tree to 00000000ece70000, end 00000000ece9c62d ... OK Working FDT set to ece70000 """ """extlinux.conf (scenario C) LABEL rk3588-jaguar LINUX /boot/fit#conf-rk3588-jaguar.dtb#conf-rk3588-jaguar-pre-ict-tester.dtbo APPEND root=PARTLABEL=debos-rootfs rw rootwait net.ifnames=0 """ Log: """ Using 'conf-rk3588-jaguar.dtb' configuration Verifying Hash Integrity ... OK Trying 'kernel-1' kernel subimage Description: Linux kernel Type: Kernel Image Compression: gzip compressed Data Start: 0x020000cc Data Size: 11862415 Bytes = 11.3 MiB Architecture: AArch64 OS: Linux Load Address: 0x06000000 Entry Point: 0x06000000 Hash algo: sha256 Hash value: 51a2b828aec49d9ede09a2de2cd05226def258dedcc8e4c4098fa2ba38fb9690 Verifying Hash Integrity ... sha256+ OK Using 'conf-rk3588-jaguar.dtb' configuration Verifying Hash Integrity ... OK Trying 'fdt-rk3588-jaguar.dtb' fdt subimage Description: Flattened Device Tree blob Type: Flat Device Tree Compression: uncompressed Data Start: 0x02b50370 Data Size: 168750 Bytes = 164.8 KiB Architecture: AArch64 Hash algo: sha256 Hash value: 96213ce3930a5f926b27c90671ca779fc327e2e62c2135f7ed7d8b6dd659b973 Verifying Hash Integrity ... sha256+ OK Loading Device Tree to 00000000ece9d000, end 00000000ecec9fff ... OK Working FDT set to ece9d000 Using 'conf-rk3588-jaguar-pre-ict-tester.dtbo' configuration Verifying Hash Integrity ... OK Trying 'fdt-rk3588-jaguar-pre-ict-tester.dtbo' fdt subimage Description: Flattened Device Tree blob Type: Flat Device Tree Compression: uncompressed Data Start: 0x02ba2bb4 Data Size: 2753 Bytes = 2.7 KiB Architecture: AArch64 Hash algo: sha256 Hash value: e5eb1fe225d03b04e9bb27c04fe3278f294b48c6ab6757292c9650f6d3ce9f34 Verifying Hash Integrity ... sha256+ OK Booting using the fdt blob at 0xece9d000 Working FDT set to ece9d000 Uncompressing Kernel Image to 6000000 Loading Device Tree to 00000000ece70000, end 00000000ece9c62d ... OK Working FDT set to ece70000 """ """extlinux.conf (scenario D) LABEL rk3588-jaguar LINUX /boot/fit#conf-rk3588-jaguar.dtb-load#conf-rk3588-jaguar-pre-ict-tester.dtbo APPEND root=PARTLABEL=debos-rootfs rw rootwait net.ifnames=0 """ Log: """ Using 'conf-rk3588-jaguar.dtb-load' configuration Verifying Hash Integrity ... OK Trying 'kernel-1' kernel subimage Description: Linux kernel Type: Kernel Image Compression: gzip compressed Data Start: 0x020000cc Data Size: 11862415 Bytes = 11.3 MiB Architecture: AArch64 OS: Linux Load Address: 0x06000000 Entry Point: 0x06000000 Hash algo: sha256 Hash value: 51a2b828aec49d9ede09a2de2cd05226def258dedcc8e4c4098fa2ba38fb9690 Verifying Hash Integrity ... sha256+ OK Using 'conf-rk3588-jaguar.dtb-load' configuration Verifying Hash Integrity ... OK Trying 'fdt-rk3588-jaguar.dtb-load' fdt subimage Description: Flattened Device Tree blob Type: Flat Device Tree Compression: uncompressed Data Start: 0x02b79784 Data Size: 168750 Bytes = 164.8 KiB Architecture: AArch64 Load Address: 0x12000000 Hash algo: sha256 Hash value: 96213ce3930a5f926b27c90671ca779fc327e2e62c2135f7ed7d8b6dd659b973 Verifying Hash Integrity ... sha256+ OK Loading fdt from 0x02b79784 to 0x12000000 Loading Device Tree to 00000000ece9d000, end 00000000ecec9fff ... OK Working FDT set to ece9d000 Using 'conf-rk3588-jaguar-pre-ict-tester.dtbo' configuration Verifying Hash Integrity ... OK Trying 'fdt-rk3588-jaguar-pre-ict-tester.dtbo' fdt subimage Description: Flattened Device Tree blob Type: Flat Device Tree Compression: uncompressed Data Start: 0x02ba2bb4 Data Size: 2753 Bytes = 2.7 KiB Architecture: AArch64 Hash algo: sha256 Hash value: e5eb1fe225d03b04e9bb27c04fe3278f294b48c6ab6757292c9650f6d3ce9f34 Verifying Hash Integrity ... sha256+ OK Booting using the fdt blob at 0xece9d000 Working FDT set to ece9d000 Uncompressing Kernel Image to 6000000 Loading Device Tree to 00000000ece70000, end 00000000ece9c62d ... OK Working FDT set to ece70000 """ Cc: Heiko Stuebner <heiko(a)sntech.de> --- Changes in v2: - Indiscriminately relocate, regardless of location of FDT to be on the safe side wrt data overlap/overwrite, - print return value of boot_relocate_fdt when it fails, - Link to v1: https://lore.kernel.org/r/20241219-extlinux-relocate-dtb-when-dtbo-v1-1-fe5… --- boot/image-fit.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/boot/image-fit.c b/boot/image-fit.c index db7fb61bca948e42a4136b9ceb263a53362ad3f8..f3df8e2393559596f5100ea54a7ede77407713ac 100644 --- a/boot/image-fit.c +++ b/boot/image-fit.c @@ -2348,10 +2348,10 @@ int boot_get_fdt_fit(struct bootm_headers *images, ulong addr, char *next_config = NULL; ulong load, len; #ifdef CONFIG_OF_LIBFDT_OVERLAY - ulong image_start, image_end; ulong ovload, ovlen, ovcopylen; const char *uconfig; const char *uname; + char *of_flat_tree; void *base, *ov, *ovcopy = NULL; int i, err, noffset, ov_noffset; #endif @@ -2395,17 +2395,18 @@ int boot_get_fdt_fit(struct bootm_headers *images, ulong addr, /* we need to apply overlays */ #ifdef CONFIG_OF_LIBFDT_OVERLAY - image_start = addr; - image_end = addr + fit_get_size(fit); - /* verify that relocation took place by load address not being in fit */ - if (load >= image_start && load < image_end) { - /* check is simplified; fit load checks for overlaps */ - printf("Overlayed FDT requires relocation\n"); + /* Relocate FDT so resizing does not overwrite other data in FIT. */ + of_flat_tree = map_sysmem(load, len); + len = ALIGN(fdt_totalsize(load), SZ_4K); + err = boot_relocate_fdt(&of_flat_tree, &len); + if (err) { + printf("Required FDT relocation for applying DTOs failed: %d\n", + err); fdt_noffset = -EBADF; goto out; } - base = map_sysmem(load, len); + load = (ulong)of_flat_tree; /* apply extra configs in FIT first, followed by args */ for (i = 1; ; i++) { --- base-commit: 6a0db9ee030f634731b792d864fc7a9df6cc6b80 change-id: 20241219-extlinux-relocate-dtb-when-dtbo-4c7536f880b2 Best regards, -- Quentin Schulz <quentin.schulz(a)cherry.de>

3 3

[U-Boot][PATCH v4 0/5] Improve fpga cmd usage information
by Ibai Erkiaga 21 Jan '25

21 Jan '25

Current usage information is not read friendly specially when all the options are selected. This series fix some of the issues in the info, aligment and overlapping issues, excess of verbosity on the loads... Additionally Xilinx exclusive command dependencies are included to remove text stating Xilinx Only The output looks like this now: fpga - loadable FPGA image support Usage: fpga info [dev] List known device information fpga dump <dev> <address> <size> Load device to memory buffer fpga load <dev> <address> <size> Load device from memory buffer fpga loadb <dev> <address> <size> Load device from bitstream buffer fpga loadp <dev> <address> <size> Load device from memory buffer with partial bitstream fpga loadbp <dev> <address> <size> Load device from bitstream buffer with partial bitstream fpga loadfs <dev> <address> <size> <blocksize> <interface> [<dev[:part]>] <filename> Load device from filesystem (FAT by default) fpga loadmk <dev> <address> Load device generated with mkimage NOTE: loadmk operating on FIT must include subimage unit name in the form of addr:<subimg_uname> fpga loads <dev> <address> <size> <authflag> <encflag> [Userkey address] Load device from memory buffer with secure bistream (authenticated/encrypted/both) -authflag: 0 for OCM, 1 for DDR, 2 for no authentication (specifies where to perform authentication) -encflag: 0 for device key, 1 for user key, 2 for no encryption -Userkey address: address where user key is stored NOTE: secure bitstream has to be created using Xilinx bootgen tool Changes in v4: - Split 4th patch into two, one for existing symbol dependencies and one for the new symbol Changes in v3: - Split 3rd patch into two, resorting commands and Kconfig changes Changes in v2: - Tabs replaced by spaces - fpga command added on each option similar to other commands like sf - Dependencies to Xilinx only commands added in Kconfig Ibai Erkiaga (5): fpga: fix alignment on fpga cmd usage info fpga: improve loads usage information fpga: resort fpga commands fpga: xilinx exclusive commands fpga: add new symbol for fpga_loadb cmd/Kconfig | 31 ++++++++++++++++----------- cmd/fpga.c | 62 ++++++++++++++++++++++++----------------------------- 2 files changed, 47 insertions(+), 46 deletions(-) -- 2.42.0.325.g3a06386e31

3 8

[PATCH 0/6] Rework the BLK symbol usage in Kconfig
by Tom Rini 21 Jan '25

21 Jan '25

Hey all, One problem we have today is how the BLK symbol is set and used in Kconfig files. Part of the challenge is that we use it as a gating symbol for "we have a block device" and also for "enable block device library code". What this series does is move to always use "select BLK" by block drivers (a few were and a few others had it the inverse) and then "depends on BLK" for functionality that needs a block device present. The end result of this series is that a number of platforms which had disabled EFI_LOADER now don't ask for it (they have no block device) and espresso7420 has a regression about MMC support fixed. -- Tom

5 37

[PATCH 0/3] net: use strnstr() for lwip_strnstr()
by Heinrich Schuchardt 21 Jan '25

21 Jan '25

Using strstr() instead of strnstr() creates a security concern. * Implement missing library function strnstr() and add unit tests. * Use it for lwIP. Heinrich Schuchardt (3): lib: implement strnstr() test: unit tests for strstr() and strnstr() net: use strnstr() for lwip_strnstr() include/linux/string.h | 3 +++ lib/lwip/u-boot/arch/cc.h | 2 +- lib/string.c | 49 +++++++++++++++++++++++++++------------ test/lib/string.c | 40 ++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 16 deletions(-) -- 2.47.1

5 13

[PATCH] sunxi: pinephone: detect existed magnetometer and fixup dtb
by Andrey Skvortsov 21 Jan '25

21 Jan '25

In newer 1.2 PinePhone board revisions LIS3MDL magnetometer was replaced by AF8133J. They use the same PB1 pin in different modes. LIS3MDL uses it as an gpio input to handle interrupt. AF8133J uses it as an gpio output as a reset signal. It wasn't possible at runtime to enable both device tree nodes and detect supported sensor at probe time. AF8133J has reset pin (PB1) connected to the SoC. By default AF8133J is in a reset state and don't respond to probe request on I2C bus. Extra code would be needed to handle reset signal. Therefore this code uses LIS3MDL magnetometer instead of AF8133J. Introducing new dts 1.2b with AF8133J sensor would require probing in SPL. That would lead to pulling in into SPL I2C controller driver, RSB controller driver, introducing new AXP803 driver to power-up sensors for probe. It's working, but SPL is pretty size-constrained on A64 and doesn't have much space. Therefore fdt fixup is done in U-Boot proper without introducing new board revision and new dts. Signed-off-by: Andrey Skvortsov <andrej.skvortzov(a)gmail.com> Link: https://lore.kernel.org/all/20240908214718.36316-1-andrej.skvortzov@gmail.c… Link: https://lists.denx.de/pipermail/u-boot/2024-February/545700.html --- This patch was discussed previously as RFC. [1] All relevant kernel device-tree changes are merged. [2] 1. https://lists.denx.de/pipermail/u-boot/2024-February/545700.html 2. https://lore.kernel.org/all/20240908214718.36316-1-andrej.skvortzov@gmail.c… board/sunxi/board.c | 23 +++++++++++++++++++++++ configs/pinephone_defconfig | 1 + 2 files changed, 24 insertions(+) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 824c322a0dc..703081b403f 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -14,6 +14,7 @@ #include <dm.h> #include <env.h> #include <hang.h> +#include <i2c.h> #include <image.h> #include <init.h> #include <log.h> @@ -876,6 +877,27 @@ static void bluetooth_dt_fixup(void *blob) "local-bd-address", bdaddr, ETH_ALEN, 1); } +#define PINEPHONE_LIS3MDL_I2C_ADDR 0x1E +#define PINEPHONE_LIS3MDL_I2C_BUS 1 /* I2C1 */ + +static void board_dt_fixup(void *blob) +{ + struct udevice *bus, *dev; + + if (IS_ENABLED(CONFIG_PINEPHONE_DT_SELECTION) && + !fdt_node_check_compatible(blob, 0, "pine64,pinephone-1.2")) { + if (!uclass_get_device_by_seq(UCLASS_I2C, PINEPHONE_LIS3MDL_I2C_BUS, &bus)) { + dm_i2c_probe(bus, PINEPHONE_LIS3MDL_I2C_ADDR, 0, &dev); + fdt_set_status_by_compatible( + blob, "st,lis3mdl-magn", + dev ? FDT_STATUS_OKAY : FDT_STATUS_DISABLED); + fdt_set_status_by_compatible( + blob, "voltafield,af8133j", + dev ? FDT_STATUS_DISABLED : FDT_STATUS_OKAY); + } + } +} + int ft_board_setup(void *blob, struct bd_info *bd) { int __maybe_unused r; @@ -889,6 +911,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) fdt_fixup_ethernet(blob); bluetooth_dt_fixup(blob); + board_dt_fixup(blob); #ifdef CONFIG_VIDEO_DT_SIMPLEFB r = sunxi_simplefb_setup(blob); diff --git a/configs/pinephone_defconfig b/configs/pinephone_defconfig index 9d39204a439..0f9ab0c4662 100644 --- a/configs/pinephone_defconfig +++ b/configs/pinephone_defconfig @@ -11,6 +11,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_PINEPHONE_DT_SELECTION=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_OF_LIST="sun50i-a64-pinephone-1.1 sun50i-a64-pinephone-1.2" +CONFIG_SYS_I2C_MVTWSI=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS_GPIO=y CONFIG_LED_STATUS0=y -- 2.45.2

2 1

[PATCH v2] usb: dwc3: core: Fix timeout check
by Varadarajan Narayanan 21 Jan '25

21 Jan '25

dwc3_core_init loops 'timeout' times to check if the IP block is out of reset using 'while (timeout--)'. If there is some issue and the block doesn't come out of reset, the loop will run till 'timeout' becomes zero and the post decrement operator would set timeout to 0xffffffff. Though the IP block is not out reset, the subsequent if check 'if !timeout' would fail as timeout is not equal to zero and the function proceeds with the initialization. Use poll API instead to resolve this. Tested-By: Varadarajan Narayanan <quic_varada(a)quicinc.com> Signed-off-by: Varadarajan Narayanan <quic_varada(a)quicinc.com> --- v2: * Use poll API and remove the timeout variable based loop as suggested by 'Marek Vasut' * Drop 'Reviewed-by: Neil Armstrong' as the patch has taken a very different shape --- drivers/usb/dwc3/core.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index a35b8c2f64..847fa1f82c 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -23,6 +23,7 @@ #include <linux/delay.h> #include <linux/dma-mapping.h> #include <linux/err.h> +#include <linux/iopoll.h> #include <linux/ioport.h> #include <dm.h> #include <generic-phy.h> @@ -587,7 +588,6 @@ static void dwc3_set_incr_burst_type(struct dwc3 *dwc) */ static int dwc3_core_init(struct dwc3 *dwc) { - unsigned long timeout; u32 hwparams4 = dwc->hwparams.hwparams4; u32 reg; int ret; @@ -610,15 +610,11 @@ static int dwc3_core_init(struct dwc3 *dwc) } /* issue device SoftReset too */ - timeout = 5000; dwc3_writel(dwc->regs, DWC3_DCTL, DWC3_DCTL_CSFTRST); - while (timeout--) { - reg = dwc3_readl(dwc->regs, DWC3_DCTL); - if (!(reg & DWC3_DCTL_CSFTRST)) - break; - }; - - if (!timeout) { + ret = read_poll_timeout(dwc3_readl, reg, + !(reg & DWC3_DCTL_CSFTRST), + 1, 5000, dwc->regs, DWC3_DCTL); + if (ret) { dev_err(dwc->dev, "Reset Timed Out\n"); ret = -ETIMEDOUT; goto err0; -- 2.34.1

4 3