November 2021 - U-Boot

[PATCH] binman: Fix replace subcommand help
by Jan Kiszka 11 Nov '21

11 Nov '21

From: Jan Kiszka <jan.kiszka(a)siemens.com> Fix some copy&paste artifacts: Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> --- tools/binman/cmdline.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/binman/cmdline.py b/tools/binman/cmdline.py index d6156df408..e1a4cea961 100644 --- a/tools/binman/cmdline.py +++ b/tools/binman/cmdline.py @@ -99,7 +99,7 @@ controlled by a description in the board device tree.''' replace_parser.add_argument('-C', '--compressed', action='store_true', help='Input data is already compressed if needed for the entry') replace_parser.add_argument('-i', '--image', type=str, required=True, - help='Image filename to extract') + help='Image filename to replace') replace_parser.add_argument('-f', '--filename', type=str, help='Input filename to read from') replace_parser.add_argument('-F', '--fix-size', action='store_true', @@ -109,7 +109,7 @@ controlled by a description in the board device tree.''' replace_parser.add_argument('-m', '--map', action='store_true', default=False, help='Output a map file for the updated image') replace_parser.add_argument('paths', type=str, nargs='*', - help='Paths within file to extract (wildcard)') + help='Paths within file to replace (wildcard)') test_parser = subparsers.add_parser('test', help='Run tests') test_parser.add_argument('-P', '--processes', type=int, -- 2.31.1

2 1

Slow MMC IO with Raspberry CM3+ Module
by Mario Lombardo 10 Nov '21

10 Nov '21

Dear u-boot list, I recently compiled (latest: 2021.10) code of uboot as a boot loader for the Compute Module 3+ (Raspberry). Everything works fine except one issue: the IO from the storage is extreme slow. I read about issues in the past related to ext file systems. However the present issue relates to both ext and fat file systems so I assume its cause is different. This is what I did: U-Boot> setenv pio_kernel "recovery/kernel.img" U-Boot> setenv pio_initrd "recovery/initrd.img" U-Boot> fatload mmc 0:1 ${kernel_addr_r} ${pio_kernel} 5299624 bytes read in 45262 ms (114.3 KiB/s) U-Boot> fatload mmc 0:1 ${ramdisk_addr_r} ${pio_initrd} 24239932 bytes read in 206978 ms (114.3 KiB/s) The configuration of by build is attached. Is there anyone else experiencing this kind of issues? Thank you very much. Mario

4 5

[PULL] Pull request for u-boot/master v2022.01 = u-boot-stm32-20211110
by Patrice CHOTARD 10 Nov '21

10 Nov '21

Hi Tom Please pull the STM32 related patches for u-boot/master, v2022.01: u-boot-stm32-20211110 CI status: https://source.denx.de/u-boot/custodians/u-boot-stm/-/pipelines/9799 Thanks Patrice The following changes since commit a79115dde373f7cdb181040dd6489fd0b21bfbd2: Prepare v2022.01-rc1 (2021-11-01 15:16:43 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-stm.git tags/u-boot-stm32-20211110 for you to fetch changes up to c8b2eef52b6c8c48aba63c64078ff67fa5dea9e3: stm32mp15: tidy up #ifdefs in cpu.c (2021-11-10 17:07:31 +0100) ---------------------------------------------------------------- - DHSOM update: - Remove nWP GPIO hog - Increase SF bus frequency to 50Mhz and enable SFDP - Disable video output for DHSOM - Disable EFI - Enable DFU_MTD support - Create include file for STM32 gpio driver private data - Split board and SOC STM32MP15 configuration - Device tree alignement with v5.15-rc6 for STM32MP15 - Add binman support for STM32MP15x - Normalise newlines for stm32prog - Update OTP shadow registers in SPL ---------------------------------------------------------------- Marek Vasut (6): ARM: stm32: Enable DFU MTD support on DHSOM ARM: dts: stm32: Drop nWP GPIO hog on DHSOM ARM: stm32: Increase default SF bus frequency to 50 MHz and enable SFDP ARM: stm32: Disable EFI on DHSOM ARM: stm32: Disable video output on DHSOM ARM: stm32: Align mtdparts with SPI NOR layout on DHSOM Patrick Delaunay (8): stm32mp: add binman support for STM32MP15x arm: dts: stm32mp15: alignment with v5.15-rc6 board: stmp32mp1: split board and SOC STM32MP15 configuration gpio: stm32: create include file for driver private data arm: stm32mp: bsec: Update OTP shadow registers in SPL stm32mp15: remove configs dependency on CONFIG_TFABOOT stm32mp15: replace CONFIG_TFABOOT when it is possible stm32mp15: tidy up #ifdefs in cpu.c William Grant (1): stm32mp: stm32prog: Normalise newlines arch/arm/Kconfig | 2 - arch/arm/dts/stm32mp15-u-boot.dtsi | 29 ++++++++ arch/arm/dts/stm32mp157c-ed1.dts | 4 +- arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 9 --- arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi | 9 --- arch/arm/dts/stm32mp15xx-dkx.dtsi | 12 +-- arch/arm/include/asm/arch-stm32f4/gpio.h | 15 ---- arch/arm/include/asm/arch-stm32f7/gpio.h | 12 --- arch/arm/include/asm/arch-stm32h7/gpio.h | 12 --- arch/arm/mach-stm32mp/Kconfig | 9 +-- arch/arm/mach-stm32mp/bsec.c | 15 ++-- arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig | 3 +- arch/arm/mach-stm32mp/config.mk | 29 -------- arch/arm/mach-stm32mp/cpu.c | 52 +++++++------ arch/arm/mach-stm32mp/include/mach/gpio.h | 87 ---------------------- board/dhelectronics/dh_stm32mp1/Kconfig | 2 +- board/dhelectronics/dh_stm32mp1/MAINTAINERS | 2 +- board/dhelectronics/dh_stm32mp1/Makefile | 1 - board/engicam/stm32mp1/Kconfig | 2 +- board/st/stm32f746-disco/stm32f746-disco.c | 1 - board/st/stm32mp1/Kconfig | 2 +- board/st/stm32mp1/MAINTAINERS | 3 +- board/st/stm32mp1/stm32mp1.c | 6 +- configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig | 2 + .../stm32mp15-icore-stm32mp1-edimm2.2_defconfig | 2 + ...2mp15-microgea-stm32mp1-microdev2-of7_defconfig | 2 + ...stm32mp15-microgea-stm32mp1-microdev2_defconfig | 2 + configs/stm32mp15_basic_defconfig | 2 + configs/stm32mp15_defconfig | 4 + configs/stm32mp15_dhcom_basic_defconfig | 29 ++++---- configs/stm32mp15_dhcor_basic_defconfig | 28 +++---- configs/stm32mp15_trusted_defconfig | 4 + drivers/clk/clk_stm32mp1.c | 4 +- drivers/gpio/stm32_gpio.c | 3 +- .../gpio.h => drivers/gpio/stm32_gpio_priv.h | 6 +- drivers/pinctrl/pinctrl_stm32.c | 3 +- drivers/ram/stm32mp1/stm32mp1_ram.c | 13 ++-- drivers/video/dw_mipi_dsi.c | 1 - drivers/video/stm32/stm32_dsi.c | 1 - drivers/video/stm32/stm32_ltdc.c | 1 - include/configs/{stm32mp1.h => stm32mp15_common.h} | 53 ++++++++----- .../{dh_stm32mp1.h => stm32mp15_dh_dhsom.h} | 6 +- include/configs/stm32mp15_st_common.h | 46 ++++++++++++ 43 files changed, 226 insertions(+), 304 deletions(-) delete mode 100644 arch/arm/include/asm/arch-stm32f4/gpio.h delete mode 100644 arch/arm/include/asm/arch-stm32f7/gpio.h delete mode 100644 arch/arm/include/asm/arch-stm32h7/gpio.h delete mode 100644 arch/arm/mach-stm32mp/config.mk delete mode 100644 arch/arm/mach-stm32mp/include/mach/gpio.h rename arch/arm/include/asm/arch-stm32/gpio.h => drivers/gpio/stm32_gpio_priv.h (94%) rename include/configs/{stm32mp1.h => stm32mp15_common.h} (77%) rename include/configs/{dh_stm32mp1.h => stm32mp15_dh_dhsom.h} (65%) create mode 100644 include/configs/stm32mp15_st_common.h

2 1

Pull request: u-boot-sunxi/master fix for 2022.01
by Andre Przywara 10 Nov '21

10 Nov '21

Hi Tom, as discussed, please pull this patch to disable the watchdog on sunxi boards by default. The watchdog only got enabled in this release cycle, and its short period breaks actual users (Debian installer). Thanks, Andre ======================== The following changes since commit e8e9c6f48400989c5fc54467576f8d535bd713e6: Merge https://source.denx.de/u-boot/custodians/u-boot-samsung (2021-11-09 15:05:33 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-sunxi.git master for you to fetch changes up to 86798ee0c148db248d8e3e9b6395bbe9e24d9149: watchdog: don't autostart watchdog on Sunxi boards (2021-11-10 01:38:07 +0000) ---------------------------------------------------------------- Heinrich Schuchardt (1): watchdog: don't autostart watchdog on Sunxi boards drivers/watchdog/Kconfig | 1 + 1 file changed, 1 insertion(+)

3 2

Re: U-boot
by Simon Glass 10 Nov '21

10 Nov '21

Hi Roman, see signature.txt : - required: If present this indicates that the key must be verified for the image / configuration to be considered valid. Only required keys are normally verified by the FIT image booting algorithm. Valid values are "image" to force verification of all images, and "conf" to force verification of the selected configuration (which then relies on hashes in the images to verify those). Regards, Simon On Wed, 10 Nov 2021 at 04:20, Roman Kopytin <Roman.Kopytin(a)kaspersky.com> wrote: > > Hi, Rasmus and Simon > I need more details about -r <conf|image> for fdt_add_pubkey. > I need to add small help for tool, please provide details. > > -----Original Message----- > From: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> > Sent: Monday, August 2, 2021 12:37 PM > To: Roman Kopytin <Roman.Kopytin(a)kaspersky.com>; Simon Glass <sjg(a)chromium.org> > Cc: Thomas Perrot <thomas.perrot(a)bootlin.com>; Michael Nazzareno Trimarchi <michael(a)amarulasolutions.com>; U-Boot-Denx <u-boot(a)lists.denx.de>; Alex Kiernan <alex.kiernan(a)gmail.com> > Subject: Re: U-boot > > Caution: This is an external email. Be cautious while opening links or attachments. > > > > On 02/08/2021 11.25, Roman Kopytin wrote: > > Thanks a lot! > > Yes, looks like using of the 'fdtput' is not very safety for me. > > As I understood I need to use "fdt_add_pubkey" tool with CMD (example): > > ./ fdt_add_pubkey -a rsa2048 -k <keydir> -n <keyname> -r <conf|image> > > my_file.dtb > > > > -r <conf|image> is the same as for mkimage? As I remember we can use -r w/o any values in mkimage. > > Yes, that's very close to what our Yocto recipe currently does: > > for b in ${KERNEL_PUBLIC_KEYS} ; do > fdt_add_pubkey -a 'sha1,rsa2048' -k "${KERNEL_SIGNING_DIR}" -n "$b" \ > -r conf $dtb > done > > I doubt that old patch applies nowadays, I've only forward-ported it to > 2020.04 internally. > > As to Simon's old question of whether it could be done in mkimage with a new flag: I'd really prefer not to, mkimage is already an incoherent collection of tools that do very different things with different flags. > Having a flag that says "create and sign this FIT image, and as a side effect update $this dtb $overhere with the corresponding public key mangled appropriately, oh, and btw, _only_ do that side effect" is a non-starter. > > Rasmus

1 0

Please pull u-boot-marvell/master
by Stefan Roese 10 Nov '21

10 Nov '21

Hi Tom, please pull the next batch of Marvell MVEBU related patches. Mostly improvements for v0 image compatibility and stability patches for kwboot/kwbimage from Pali. Here the summary log: ---------------------------------------------------------------- - Minor kwboot improvements (Pali) - Misc kwbimage improvements (Pali) - pci_mvebu: Use global MBUS_PCI_MEM_SIZE macro (Pali) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=133&view=results Thanks, Stefan The following changes since commit e8e9c6f48400989c5fc54467576f8d535bd713e6: Merge https://source.denx.de/u-boot/custodians/u-boot-samsung (2021-11-09 15:05:33 -0500) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git for you to fetch changes up to 5c61710c9880290d54db72878c4435cdaee07d78: tools: kwbimage: Properly set srcaddr in kwbimage v0 (2021-11-10 12:08:06 +0100) ---------------------------------------------------------------- Pali Rohár (14): tools: kwboot: Fix sending Kirkwood v0 images tools: kwboot: Always print kwboot version pci: pci_mvebu: Use global MBUS_PCI_MEM_SIZE macro tools: kwbimage: Add support for new commands UART_PORT and UART_MPP tools: kwbimage: Explicitly set version also for kwbimage v0 tools: kwbimage: Set BOOT_FROM by default to SPI tools: kwbimage: Fix validation of kwbimage v0 tools: kwbimage: Remove unused enums and prototypes tools: kwbimage: Align final UART image to 128 bytes tools: kwbimage: Do not put final image padding to the image data size tools: kwbimage: Align kwbimage header to proper size tools: kwbimage: Fill the real header size into the main header tools: kwbimage: Properly calculate and align kwbimage v0 header size tools: kwbimage: Properly set srcaddr in kwbimage v0 drivers/pci/pci_mvebu.c | 11 +-- tools/kwbimage.c | 250 +++++++++++++++++++++++++++++++++--------------- tools/kwbimage.h | 25 +---- tools/kwboot.c | 28 ++++-- 4 files changed, 200 insertions(+), 114 deletions(-)

2 1

[PATCH] ARM: stm32: Align mtdparts with SPI NOR layout on DHSOM
by Marek Vasut 10 Nov '21

10 Nov '21

The DHSOM uses different SPI NOR layout than the ST devkit, stop pulling in the ST specific runtime mtdparts settings and adjust the mtdparts accordingly. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- board/dhelectronics/dh_stm32mp1/Makefile | 1 - configs/stm32mp15_dhcom_basic_defconfig | 3 ++- configs/stm32mp15_dhcor_basic_defconfig | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/board/dhelectronics/dh_stm32mp1/Makefile b/board/dhelectronics/dh_stm32mp1/Makefile index b368b396a46..30db1dee807 100644 --- a/board/dhelectronics/dh_stm32mp1/Makefile +++ b/board/dhelectronics/dh_stm32mp1/Makefile @@ -5,5 +5,4 @@ obj-y += ../../st/common/stpmic1.o board.o -obj-$(CONFIG_SYS_MTDPARTS_RUNTIME) += ../../st/common/stm32mp_mtdparts.o obj-$(CONFIG_SET_DFU_ALT_INFO) += ../../st/common/stm32mp_dfu.o diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig index 5ecc91c7c1b..f51896ed472 100644 --- a/configs/stm32mp15_dhcom_basic_defconfig +++ b/configs/stm32mp15_dhcom_basic_defconfig @@ -61,6 +61,8 @@ CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nor0=nor0" +CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:256k(fsbl1),256k(fsbl2),1408k(uboot),64k(env1),64k(env2)" # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_ISO_PARTITION is not set # CONFIG_SPL_PARTITION_UUIDS is not set @@ -102,7 +104,6 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_STM32_SDMMC2=y CONFIG_MTD=y CONFIG_DM_MTD=y -CONFIG_SYS_MTDPARTS_RUNTIME=y CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_SPEED=50000000 CONFIG_SPI_FLASH_SFDP_SUPPORT=y diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig index 7c410b8224a..13e4553ac82 100644 --- a/configs/stm32mp15_dhcor_basic_defconfig +++ b/configs/stm32mp15_dhcor_basic_defconfig @@ -59,6 +59,8 @@ CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nor0=nor0" +CONFIG_MTDPARTS_DEFAULT="mtdparts=nor0:256k(fsbl1),256k(fsbl2),1408k(uboot),64k(env1),64k(env2)" # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_ISO_PARTITION is not set # CONFIG_SPL_PARTITION_UUIDS is not set -- 2.33.0

4 6

[PATCH] net: phy: realtek: Add tx/rx delay config for 8211e
by Samuel Holland 10 Nov '21

10 Nov '21

Some boards need to change the tx/rx delay config in order for gigabit Ethernet to work. In Linux commit bbc4d71d6354 ("net: phy: realtek: fix rtl8211e rx/tx delay config"), Realtek documented the bits for overriding the delays from the hardware straps. Copy the logic from linux, so the delay config is set from the PHY's interface type (the phy-mode property in the device tree). This removes the need for a one-off workaround for the Pine A64+ board. Signed-off-by: Samuel Holland <samuel(a)sholland.org> --- This change is needed for the Allwinner D1 Nezha board, which has incorrect hardware straps. configs/pine64_plus_defconfig | 1 - drivers/net/phy/Kconfig | 10 ----- drivers/net/phy/realtek.c | 69 ++++++++++++++++++++++------------- 3 files changed, 43 insertions(+), 37 deletions(-) diff --git a/configs/pine64_plus_defconfig b/configs/pine64_plus_defconfig index d1c2c3c3cc..f42f4e5923 100644 --- a/configs/pine64_plus_defconfig +++ b/configs/pine64_plus_defconfig @@ -8,7 +8,6 @@ CONFIG_PINE64_DT_SELECTION=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_OF_LIST="sun50i-a64-pine64 sun50i-a64-pine64-plus" CONFIG_PHY_REALTEK=y -CONFIG_RTL8211E_PINE64_GIGABIT_FIX=y CONFIG_SUN8I_EMAC=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 68ee7d7a2d..e69cd8a4b3 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -214,16 +214,6 @@ config PHY_NXP_C45_TJA11XX config PHY_REALTEK bool "Realtek Ethernet PHYs support" -config RTL8211E_PINE64_GIGABIT_FIX - bool "Fix gigabit throughput on some Pine64+ models" - depends on PHY_REALTEK - help - Configure the Realtek RTL8211E found on some Pine64+ models differently to - fix throughput on Gigabit links, turning off all internal delays in the - process. The settings that this touches are not documented in the CONFREG - section of the RTL8211E datasheet, but come from Realtek by way of the - Pine64 engineering team. - config RTL8211X_PHY_FORCE_MASTER bool "Ethernet PHY RTL8211x: force 1000BASE-T master mode" depends on PHY_REALTEK diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index b1b1fa5080..84c755525f 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -12,7 +12,6 @@ #include <linux/delay.h> #define PHY_RTL8211x_FORCE_MASTER BIT(1) -#define PHY_RTL8211E_PINE64_GIGABIT_FIX BIT(2) #define PHY_RTL8211F_FORCE_EEE_RXC_ON BIT(3) #define PHY_RTL8201F_S700_RMII_TIMINGS BIT(4) @@ -49,10 +48,10 @@ #define MIIM_RTL8211F_PHYSTAT_SPDDONE 0x0800 #define MIIM_RTL8211F_PHYSTAT_LINK 0x0004 -#define MIIM_RTL8211E_CONFREG 0x1c -#define MIIM_RTL8211E_CONFREG_TXD 0x0002 -#define MIIM_RTL8211E_CONFREG_RXD 0x0004 -#define MIIM_RTL8211E_CONFREG_MAGIC 0xb400 /* Undocumented */ +#define MIIM_RTL8211E_CONFREG 0x1c +#define MIIM_RTL8211E_CTRL_DELAY BIT(13) +#define MIIM_RTL8211E_TX_DELAY BIT(12) +#define MIIM_RTL8211E_RX_DELAY BIT(11) #define MIIM_RTL8211E_EXT_PAGE_SELECT 0x1e @@ -108,10 +107,6 @@ static int rtl8211b_probe(struct phy_device *phydev) static int rtl8211e_probe(struct phy_device *phydev) { -#ifdef CONFIG_RTL8211E_PINE64_GIGABIT_FIX - phydev->flags |= PHY_RTL8211E_PINE64_GIGABIT_FIX; -#endif - return 0; } @@ -154,22 +149,6 @@ static int rtl8211x_config(struct phy_device *phydev) reg |= MIIM_RTL8211x_CTRL1000T_MASTER; phy_write(phydev, MDIO_DEVAD_NONE, MII_CTRL1000, reg); } - if (phydev->flags & PHY_RTL8211E_PINE64_GIGABIT_FIX) { - unsigned int reg; - - phy_write(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211F_PAGE_SELECT, - 7); - phy_write(phydev, MDIO_DEVAD_NONE, - MIIM_RTL8211E_EXT_PAGE_SELECT, 0xa4); - reg = phy_read(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211E_CONFREG); - /* Ensure both internal delays are turned off */ - reg &= ~(MIIM_RTL8211E_CONFREG_TXD | MIIM_RTL8211E_CONFREG_RXD); - /* Flip the magic undocumented bits */ - reg |= MIIM_RTL8211E_CONFREG_MAGIC; - phy_write(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211E_CONFREG, reg); - phy_write(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211F_PAGE_SELECT, - 0); - } /* read interrupt status just to clear it */ phy_read(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211x_PHY_INER); @@ -201,6 +180,44 @@ static int rtl8201f_config(struct phy_device *phydev) return 0; } +static int rtl8211e_config(struct phy_device *phydev) +{ + int reg, val; + + /* enable TX/RX delay for rgmii-* modes, and disable them for rgmii. */ + switch (phydev->interface) { + case PHY_INTERFACE_MODE_RGMII: + val = MIIM_RTL8211E_CTRL_DELAY; + break; + case PHY_INTERFACE_MODE_RGMII_ID: + val = MIIM_RTL8211E_CTRL_DELAY | MIIM_RTL8211E_TX_DELAY | + MIIM_RTL8211E_RX_DELAY; + break; + case PHY_INTERFACE_MODE_RGMII_RXID: + val = MIIM_RTL8211E_CTRL_DELAY | MIIM_RTL8211E_TX_DELAY; + break; + case PHY_INTERFACE_MODE_RGMII_TXID: + val = MIIM_RTL8211E_CTRL_DELAY | MIIM_RTL8211E_RX_DELAY; + break; + default: /* the rest of the modes imply leaving delays as is. */ + goto default_delay; + } + + phy_write(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211F_PAGE_SELECT, 7); + phy_write(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211E_EXT_PAGE_SELECT, 0xa4); + + reg = phy_read(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211E_CONFREG); + reg &= ~(MIIM_RTL8211E_TX_DELAY | MIIM_RTL8211E_RX_DELAY); + phy_write(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211E_CONFREG, reg | val); + + phy_write(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211F_PAGE_SELECT, 0); + +default_delay: + genphy_config_aneg(phydev); + + return 0; +} + static int rtl8211f_config(struct phy_device *phydev) { u16 reg; @@ -410,7 +427,7 @@ static struct phy_driver RTL8211E_driver = { .mask = 0xffffff, .features = PHY_GBIT_FEATURES, .probe = &rtl8211e_probe, - .config = &rtl8211x_config, + .config = &rtl8211e_config, .startup = &rtl8211e_startup, .shutdown = &genphy_shutdown, }; -- 2.32.0

4 6

[PATCH] stm32mp: stm32prog: Normalise newlines
by William Grant 10 Nov '21

10 Nov '21

The missing trailing newline could confuse check-config.sh if the definition of an option was on the first line of the next file that find(1) happened to return. Signed-off-by: William Grant <wgrant(a)ubuntu.com> --- arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig b/arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig index f4c0d18d4d..dd166a1f91 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig @@ -1,4 +1,3 @@ - config CMD_STM32PROG bool "command stm32prog for STM32CudeProgrammer" select DFU @@ -31,4 +30,4 @@ config CMD_STM32PROG_SERIAL help activate the command "stm32prog serial" for STM32MP soc family with the tools STM32CubeProgrammer using U-Boot serial device - and UART protocol. \ No newline at end of file + and UART protocol. -- 2.32.0

3 2

[PATCH v2] stm32mp: add binman support for STM32MP15x
by Patrick Delaunay 10 Nov '21

10 Nov '21

Use binman to add the stm32image header on SPL binary for basic boot or on U-Boot binary when it is required, i.e. for TF-A boot without FIP support, when CONFIG_STM32MP15x_STM32IMAGE is activated. The "binman" tool is the recommended tool for specific image generation. This patch allows to suppress the config.mk file and it is a preliminary step to manage FIT generation with binman. The init_r parsing of U-Boot device tree to search the binman information is not required for STM32MP15, so the binman library can be removed in U-Boot (CONFIG_BINMAN_FDT is deactivated). Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- Changes in v2: - deactivate CONFIG_BINMAN_FDT arch/arm/dts/stm32mp15-u-boot.dtsi | 29 +++++++++++++++++++ arch/arm/mach-stm32mp/Kconfig | 1 + arch/arm/mach-stm32mp/config.mk | 29 ------------------- ...stm32mp15-icore-stm32mp1-ctouch2_defconfig | 1 + ...tm32mp15-icore-stm32mp1-edimm2.2_defconfig | 1 + ...-microgea-stm32mp1-microdev2-of7_defconfig | 1 + ...mp15-microgea-stm32mp1-microdev2_defconfig | 1 + configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_defconfig | 1 + configs/stm32mp15_dhcom_basic_defconfig | 1 + configs/stm32mp15_dhcor_basic_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + 12 files changed, 39 insertions(+), 29 deletions(-) delete mode 100644 arch/arm/mach-stm32mp/config.mk diff --git a/arch/arm/dts/stm32mp15-u-boot.dtsi b/arch/arm/dts/stm32mp15-u-boot.dtsi index 43a7909978..db23d80eef 100644 --- a/arch/arm/dts/stm32mp15-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15-u-boot.dtsi @@ -21,6 +21,10 @@ pinctrl1 = &pinctrl_z; }; + binman: binman { + multiple-images; + }; + clocks { u-boot,dm-pre-reloc; }; @@ -228,3 +232,28 @@ resets = <&rcc UART8_R>; }; +#if defined(CONFIG_STM32MP15x_STM32IMAGE) +&binman { + u-boot-stm32 { + filename = "u-boot.stm32"; + mkimage { + args = "-T stm32image -a 0xC0100000 -e 0xC0100000"; + u-boot { + }; + }; + }; +}; +#endif + +#if defined(CONFIG_SPL) +&binman { + spl-stm32 { + filename = "u-boot-spl.stm32"; + mkimage { + args = "-T stm32image -a 0x2FFC2500 -e 0x2FFC2500"; + u-boot-spl { + }; + }; + }; +}; +#endif diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig index 69d56c23e1..4acb29333c 100644 --- a/arch/arm/mach-stm32mp/Kconfig +++ b/arch/arm/mach-stm32mp/Kconfig @@ -37,6 +37,7 @@ config STM32MP15x bool "Support STMicroelectronics STM32MP15x Soc" select ARCH_SUPPORT_PSCI if !TFABOOT select ARM_SMCCC if TFABOOT + select BINMAN select CPU_V7A select CPU_V7_HAS_NONSEC if !TFABOOT select CPU_V7_HAS_VIRT diff --git a/arch/arm/mach-stm32mp/config.mk b/arch/arm/mach-stm32mp/config.mk deleted file mode 100644 index f7f5b77c41..0000000000 --- a/arch/arm/mach-stm32mp/config.mk +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause -# -# Copyright (C) 2018, STMicroelectronics - All Rights Reserved -# - -ifndef CONFIG_SPL -INPUTS-$(CONFIG_STM32MP15x_STM32IMAGE) += u-boot.stm32 -else -ifdef CONFIG_SPL_BUILD -INPUTS-y += u-boot-spl.stm32 -endif -endif - -MKIMAGEFLAGS_u-boot.stm32 = -T stm32image -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) - -u-boot.stm32: MKIMAGEOUTPUT = u-boot.stm32.log - -u-boot.stm32: u-boot.bin FORCE - $(call if_changed,mkimage) - -MKIMAGEFLAGS_u-boot-spl.stm32 = -T stm32image -a $(CONFIG_SPL_TEXT_BASE) -e $(CONFIG_SPL_TEXT_BASE) - -spl/u-boot-spl.stm32: MKIMAGEOUTPUT = spl/u-boot-spl.stm32.log - -spl/u-boot-spl.stm32: spl/u-boot-spl.bin FORCE - $(call if_changed,mkimage) - -u-boot-spl.stm32 : spl/u-boot-spl.stm32 - $(call if_changed,copy) diff --git a/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig index 14bf6d1376..ce7aece4b8 100644 --- a/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig +++ b/configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig @@ -75,5 +75,6 @@ CONFIG_RTC_STM32=y CONFIG_SERIAL_RX_BUFFER=y CONFIG_WDT=y CONFIG_WDT_STM32MP=y +# CONFIG_BINMAN_FDT is not set CONFIG_LZO=y CONFIG_ERRNO_STR=y diff --git a/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig b/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig index 648ecbfc67..52a0779802 100644 --- a/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig +++ b/configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig @@ -75,5 +75,6 @@ CONFIG_RTC_STM32=y CONFIG_SERIAL_RX_BUFFER=y CONFIG_WDT=y CONFIG_WDT_STM32MP=y +# CONFIG_BINMAN_FDT is not set CONFIG_LZO=y CONFIG_ERRNO_STR=y diff --git a/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig b/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig index f422ffbeda..31e890725c 100644 --- a/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig +++ b/configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig @@ -75,5 +75,6 @@ CONFIG_RTC_STM32=y CONFIG_SERIAL_RX_BUFFER=y CONFIG_WDT=y CONFIG_WDT_STM32MP=y +# CONFIG_BINMAN_FDT is not set CONFIG_LZO=y CONFIG_ERRNO_STR=y diff --git a/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig b/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig index 244d9ccf4e..61714b9df7 100644 --- a/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig +++ b/configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig @@ -75,5 +75,6 @@ CONFIG_RTC_STM32=y CONFIG_SERIAL_RX_BUFFER=y CONFIG_WDT=y CONFIG_WDT_STM32MP=y +# CONFIG_BINMAN_FDT is not set CONFIG_LZO=y CONFIG_ERRNO_STR=y diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig index 77ed82c99f..f9b51f7349 100644 --- a/configs/stm32mp15_basic_defconfig +++ b/configs/stm32mp15_basic_defconfig @@ -170,6 +170,7 @@ CONFIG_BMP_24BPP=y CONFIG_BMP_32BPP=y CONFIG_WDT=y CONFIG_WDT_STM32MP=y +# CONFIG_BINMAN_FDT is not set CONFIG_ERRNO_STR=y CONFIG_FDT_FIXUP_PARTITIONS=y # CONFIG_LMB_USE_MAX_REGIONS is not set diff --git a/configs/stm32mp15_defconfig b/configs/stm32mp15_defconfig index 701b1510c5..02457eb8d6 100644 --- a/configs/stm32mp15_defconfig +++ b/configs/stm32mp15_defconfig @@ -152,6 +152,7 @@ CONFIG_BMP_24BPP=y CONFIG_BMP_32BPP=y CONFIG_WDT=y CONFIG_WDT_STM32MP=y +# CONFIG_BINMAN_FDT is not set CONFIG_ERRNO_STR=y CONFIG_FDT_FIXUP_PARTITIONS=y # CONFIG_LMB_USE_MAX_REGIONS is not set diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig index 5b85f6ad03..17907dad7e 100644 --- a/configs/stm32mp15_dhcom_basic_defconfig +++ b/configs/stm32mp15_dhcom_basic_defconfig @@ -153,5 +153,6 @@ CONFIG_VIDEO_BMP_RLE8=y CONFIG_BMP_16BPP=y CONFIG_BMP_24BPP=y CONFIG_BMP_32BPP=y +# CONFIG_BINMAN_FDT is not set CONFIG_LZO=y CONFIG_FDT_FIXUP_PARTITIONS=y diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig index 37dd2754c0..d0c8d829f6 100644 --- a/configs/stm32mp15_dhcor_basic_defconfig +++ b/configs/stm32mp15_dhcor_basic_defconfig @@ -147,5 +147,6 @@ CONFIG_VIDEO_BMP_RLE8=y CONFIG_BMP_16BPP=y CONFIG_BMP_24BPP=y CONFIG_BMP_32BPP=y +# CONFIG_BINMAN_FDT is not set CONFIG_LZO=y CONFIG_FDT_FIXUP_PARTITIONS=y diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig index b4ed090e3f..5963064312 100644 --- a/configs/stm32mp15_trusted_defconfig +++ b/configs/stm32mp15_trusted_defconfig @@ -153,6 +153,7 @@ CONFIG_BMP_24BPP=y CONFIG_BMP_32BPP=y CONFIG_WDT=y CONFIG_WDT_STM32MP=y +# CONFIG_BINMAN_FDT is not set CONFIG_ERRNO_STR=y CONFIG_FDT_FIXUP_PARTITIONS=y # CONFIG_LMB_USE_MAX_REGIONS is not set -- 2.25.1

3 2