May 2022 - U-Boot

[PATCH] RFC: net: fec: get rid of CONFIG_FEC_MXC_MDIO_BASE
by Tim Harvey 16 May '22

16 May '22

A number of IMX8Q boards using FEC configure the address of the ethernet controller via defconfig as there are two FEC controllers in the SoC. Now that the FEC driver uses DM the register address should be coming from device-tree. Remove the hard coded config and while at it remove the unused CONFIG_FEC_MXC_SHARE_MDIO. This is an RFC as I do not have the affected boards to test with and would want to see a Tested-By from someone with each board. I am attempting to clean up some ugliness in the FEC driver. There appears to be multiple constructs to deal with shared MDIO busses when DM_MDIO should be the right solution for that. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> Cc: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> (maintainer:Apalis iMX8) Cc: Oliver Graute <oliver.graute(a)kococonnector.com> (maintainer:i.MX8QM CGTQMX8 BOARD) Cc: Anatolij Gustschin <agust(a)denx.de> (maintainer:CAPRICORN BOARD) Cc: Peng Fan <peng.fan(a)nxp.com> (maintainer:i.MX8QM MEK BOARD) Cc: Fabio Estevam <festevam(a)gmail.com> (maintainer:i.MX8QXP MEK BOARD) Cc: Oleh Kravchenko <oleg(a)kaa.org.ua> (maintainer:OUT4-IMX6ULL-NANO BOARD) Cc: Joe Hershberger <joe.hershberger(a)ni.com> (maintainer:NETWORK) Cc: Ramon Fried <rfried.dev(a)gmail.com> (maintainer:NETWORK) --- configs/apalis-imx8_defconfig | 2 -- configs/cgtqmx8_defconfig | 2 -- configs/colibri-imx8x_defconfig | 2 -- configs/deneb_defconfig | 2 -- configs/giedi_defconfig | 2 -- configs/imx8qm_mek_defconfig | 2 -- configs/imx8qm_rom7720_a1_4G_defconfig | 2 -- configs/imx8qxp_mek_defconfig | 2 -- configs/o4-imx6ull-nano_defconfig | 2 -- drivers/net/Kconfig | 11 ----------- drivers/net/fec_mxc.c | 5 ----- 11 files changed, 34 deletions(-) diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig index beb20f6e1c01..bd8e7f01e493 100644 --- a/configs/apalis-imx8_defconfig +++ b/configs/apalis-imx8_defconfig @@ -56,8 +56,6 @@ CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_DM_ETH=y -CONFIG_FEC_MXC_SHARE_MDIO=y -CONFIG_FEC_MXC_MDIO_BASE=0x5B040000 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y diff --git a/configs/cgtqmx8_defconfig b/configs/cgtqmx8_defconfig index 2cf882f826ab..fe62b639bd88 100644 --- a/configs/cgtqmx8_defconfig +++ b/configs/cgtqmx8_defconfig @@ -72,8 +72,6 @@ CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_ATHEROS=y CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y -CONFIG_FEC_MXC_SHARE_MDIO=y -CONFIG_FEC_MXC_MDIO_BASE=0x5B040000 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index 0c9d6b64c1b6..03e899f51fed 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -54,8 +54,6 @@ CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_MICREL=y CONFIG_DM_ETH=y -CONFIG_FEC_MXC_SHARE_MDIO=y -CONFIG_FEC_MXC_MDIO_BASE=0x5B040000 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y diff --git a/configs/deneb_defconfig b/configs/deneb_defconfig index 425fff6c70a6..d0fc11a774f8 100644 --- a/configs/deneb_defconfig +++ b/configs/deneb_defconfig @@ -94,8 +94,6 @@ CONFIG_MV88E61XX_CPU_PORT=5 CONFIG_MV88E61XX_PHY_PORTS=0x7 CONFIG_MV88E61XX_FIXED_PORTS=0x0 CONFIG_DM_ETH=y -CONFIG_FEC_MXC_SHARE_MDIO=y -CONFIG_FEC_MXC_MDIO_BASE=0x5B050000 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y diff --git a/configs/giedi_defconfig b/configs/giedi_defconfig index 4fbf7ebdcd95..24bc621cf184 100644 --- a/configs/giedi_defconfig +++ b/configs/giedi_defconfig @@ -94,8 +94,6 @@ CONFIG_MV88E61XX_CPU_PORT=5 CONFIG_MV88E61XX_PHY_PORTS=0x7 CONFIG_MV88E61XX_FIXED_PORTS=0x0 CONFIG_DM_ETH=y -CONFIG_FEC_MXC_SHARE_MDIO=y -CONFIG_FEC_MXC_MDIO_BASE=0x5B050000 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig index 2e42872f843d..448a20c7afd1 100644 --- a/configs/imx8qm_mek_defconfig +++ b/configs/imx8qm_mek_defconfig @@ -73,8 +73,6 @@ CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_ATHEROS=y CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y -CONFIG_FEC_MXC_SHARE_MDIO=y -CONFIG_FEC_MXC_MDIO_BASE=0x5B040000 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index d9997cfa8280..0a8de612ea32 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -68,8 +68,6 @@ CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_ATHEROS=y CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y -CONFIG_FEC_MXC_SHARE_MDIO=y -CONFIG_FEC_MXC_MDIO_BASE=0x5B040000 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index 43f42f7a58af..e4a3c4b103e6 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -74,8 +74,6 @@ CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_ATHEROS=y CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y -CONFIG_FEC_MXC_SHARE_MDIO=y -CONFIG_FEC_MXC_MDIO_BASE=0x5B040000 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y diff --git a/configs/o4-imx6ull-nano_defconfig b/configs/o4-imx6ull-nano_defconfig index 27a82b116304..216b4ef8a261 100644 --- a/configs/o4-imx6ull-nano_defconfig +++ b/configs/o4-imx6ull-nano_defconfig @@ -45,8 +45,6 @@ CONFIG_PHYLIB=y CONFIG_PHY_SMSC=y CONFIG_DM_ETH=y CONFIG_DM_ETH_PHY=y -CONFIG_FEC_MXC_SHARE_MDIO=y -CONFIG_FEC_MXC_MDIO_BASE=0x020b4000 CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 347fe8aa425f..82e51b098ae0 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -326,17 +326,6 @@ config ETHOC help This MAC is present in OpenRISC and Xtensa XTFPGA boards. -config FEC_MXC_SHARE_MDIO - bool "Share the MDIO bus for FEC controller" - depends on FEC_MXC - -config FEC_MXC_MDIO_BASE - hex "MDIO base address for the FEC controller" - depends on FEC_MXC_SHARE_MDIO - help - This specifies the MDIO registers base address. It is used when - two FEC controllers share MDIO bus. - config FEC_MXC bool "FEC Ethernet controller" depends on MX28 || MX5 || MX6 || MX7 || IMX8 || IMX8M || IMX8ULP || VF610 diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index a623a5c45e4d..1add6fb91f53 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1233,12 +1233,7 @@ static int fecmxc_probe(struct udevice *dev) if (!bus) { dm_mii_bus = false; -#ifdef CONFIG_FEC_MXC_MDIO_BASE - bus = fec_get_miibus((ulong)CONFIG_FEC_MXC_MDIO_BASE, - dev_seq(dev)); -#else bus = fec_get_miibus((ulong)priv->eth, dev_seq(dev)); -#endif } if (!bus) { ret = -ENOMEM; -- 2.17.1

4 4

[PATCH v4 00/25] Add support for MediaTek MT7621 SoC
by Weijie Gao 16 May '22

16 May '22

This series will add support for MediaTek MT7621 SoC with two reference boards and related drivers. The MediaTek MT7621 is a network processor integrating a dual-core dual-threaded MIPS 1004Kc processor running at a normal frequency of 880MHz. This chip can be found in many wireless routers. This series add all basic drivers which are useful in u-boot, like usb, sdxc, ethernet, spi, nand and serial. Currently this patch series only supports building the ram-bootable image as it needs the preloader from MediaTek SDK. Thanks, Weijie v4 changes: - Add full support for booting from flash v3 changes: - Rewrite clk driver to follow definitions from upstream kernel - Implement noncached_alloc() for MIPS platform - Update register remap for mtk-eth driver needed by mt7621 v2 changes: - Add a kconfig for max supported ram size - Remove network configs from default config file - Add config file for mt7621-rfb boards Weijie Gao (25): mips: add asm/mipsmtregs.h for MIPS multi-threading mips: add more definitions for asm/cm.h mips: add __image_copy_len for SPL linker script mips: add support for noncached_alloc() mips: mtmips: add support for MediaTek MT7621 SoC mips: mtmips: add two reference boards for mt7621 doc: mediatek: add documentation for mt7621 reference boards clk: mtmips: add clock driver for MediaTek MT7621 SoC reset: mtmips: add reset controller support for MediaTek MT7621 SoC pinctrl: mtmips: add support for MediaTek MT7621 SoC usb: xhci-mtk: add support for MediaTek MT7621 SoC phy: mtk-tphy: add support for MediaTek MT7621 SoC spi: add support for MediaTek MT7621 SoC gpio: add support for MediaTek MT7621 SoC watchdog: add support for MediaTek MT7621 SoC mmc: mediatek: add support for MediaTek MT7621 SoC net: mediatek: remap iobase address net: mediatek: use regmap api to modify ethsys registers net: mediatek: add support for MediaTek MT7621 SoC nand: raw: add support for MediaTek MT7621 SoC spl: allow using nand base without standard nand driver spl: spl_legacy: fix the use of SPL_COPY_PAYLOAD_ONLY spl: nand: support loading legacy image with payload compressed tools: mtk_image: add support for MT7621 NAND images MAINTAINERS: update maintainer for MediaTek MIPS platform MAINTAINERS | 8 + arch/mips/cpu/u-boot-spl.lds | 3 + arch/mips/dts/Makefile | 2 + arch/mips/dts/mediatek,mt7621-nand-rfb.dts | 52 + arch/mips/dts/mediatek,mt7621-rfb.dts | 68 + arch/mips/dts/mt7621-u-boot.dtsi | 79 ++ arch/mips/dts/mt7621.dtsi | 370 +++++ arch/mips/include/asm/cm.h | 67 + arch/mips/include/asm/mipsmtregs.h | 142 ++ arch/mips/include/asm/system.h | 20 + arch/mips/lib/cache.c | 43 + arch/mips/mach-mtmips/Kconfig | 49 +- arch/mips/mach-mtmips/Makefile | 4 + arch/mips/mach-mtmips/cpu.c | 2 +- arch/mips/mach-mtmips/mt7621/Kconfig | 115 ++ arch/mips/mach-mtmips/mt7621/Makefile | 14 + arch/mips/mach-mtmips/mt7621/init.c | 229 +++ arch/mips/mach-mtmips/mt7621/mt7621.h | 229 +++ arch/mips/mach-mtmips/mt7621/serial.c | 23 + arch/mips/mach-mtmips/mt7621/spl/Makefile | 9 + arch/mips/mach-mtmips/mt7621/spl/cps.c | 152 ++ arch/mips/mach-mtmips/mt7621/spl/dram.c | 143 ++ arch/mips/mach-mtmips/mt7621/spl/dram.h | 37 + arch/mips/mach-mtmips/mt7621/spl/launch.c | 100 ++ arch/mips/mach-mtmips/mt7621/spl/launch.h | 52 + arch/mips/mach-mtmips/mt7621/spl/launch_ll.S | 357 +++++ arch/mips/mach-mtmips/mt7621/spl/serial.c | 24 + arch/mips/mach-mtmips/mt7621/spl/spl.c | 95 ++ arch/mips/mach-mtmips/mt7621/spl/start.S | 226 +++ arch/mips/mach-mtmips/mt7621/sram_init.S | 22 + arch/mips/mach-mtmips/mt7621/tpl/Makefile | 4 + arch/mips/mach-mtmips/mt7621/tpl/start.S | 161 +++ arch/mips/mach-mtmips/mt7621/tpl/tpl.c | 146 ++ board/mediatek/mt7621/MAINTAINERS | 8 + board/mediatek/mt7621/Makefile | 3 + board/mediatek/mt7621/board.c | 6 + common/spl/Kconfig | 2 +- common/spl/spl_legacy.c | 21 +- common/spl/spl_nand.c | 27 + configs/mt7621_nand_rfb_defconfig | 81 ++ configs/mt7621_rfb_defconfig | 80 ++ doc/board/mediatek/mt7621.rst | 48 + drivers/clk/mtmips/Makefile | 1 + drivers/clk/mtmips/clk-mt7621.c | 315 +++++ drivers/gpio/Kconfig | 2 +- drivers/mmc/mtk-sd.c | 13 + drivers/mtd/nand/raw/Kconfig | 17 +- drivers/mtd/nand/raw/Makefile | 2 + drivers/mtd/nand/raw/mt7621_nand.c | 1224 +++++++++++++++++ drivers/mtd/nand/raw/mt7621_nand.h | 29 + drivers/mtd/nand/raw/mt7621_nand_spl.c | 248 ++++ drivers/net/mtk_eth.c | 45 +- drivers/phy/Kconfig | 2 +- drivers/pinctrl/mtmips/Kconfig | 9 + drivers/pinctrl/mtmips/Makefile | 1 + drivers/pinctrl/mtmips/pinctrl-mt7621.c | 307 +++++ .../pinctrl/mtmips/pinctrl-mtmips-common.c | 4 +- .../pinctrl/mtmips/pinctrl-mtmips-common.h | 12 + drivers/spi/Kconfig | 2 +- drivers/usb/host/Kconfig | 2 +- drivers/watchdog/Kconfig | 2 +- include/configs/mt7621.h | 67 + include/dt-bindings/clock/mt7621-clk.h | 46 + include/dt-bindings/reset/mt7621-reset.h | 38 + tools/mtk_image.c | 182 +++ tools/mtk_image.h | 24 + 66 files changed, 5881 insertions(+), 36 deletions(-) create mode 100644 arch/mips/dts/mediatek,mt7621-nand-rfb.dts create mode 100644 arch/mips/dts/mediatek,mt7621-rfb.dts create mode 100644 arch/mips/dts/mt7621-u-boot.dtsi create mode 100644 arch/mips/dts/mt7621.dtsi create mode 100644 arch/mips/include/asm/mipsmtregs.h create mode 100644 arch/mips/mach-mtmips/mt7621/Kconfig create mode 100644 arch/mips/mach-mtmips/mt7621/Makefile create mode 100644 arch/mips/mach-mtmips/mt7621/init.c create mode 100644 arch/mips/mach-mtmips/mt7621/mt7621.h create mode 100644 arch/mips/mach-mtmips/mt7621/serial.c create mode 100644 arch/mips/mach-mtmips/mt7621/spl/Makefile create mode 100644 arch/mips/mach-mtmips/mt7621/spl/cps.c create mode 100644 arch/mips/mach-mtmips/mt7621/spl/dram.c create mode 100644 arch/mips/mach-mtmips/mt7621/spl/dram.h create mode 100644 arch/mips/mach-mtmips/mt7621/spl/launch.c create mode 100644 arch/mips/mach-mtmips/mt7621/spl/launch.h create mode 100644 arch/mips/mach-mtmips/mt7621/spl/launch_ll.S create mode 100644 arch/mips/mach-mtmips/mt7621/spl/serial.c create mode 100644 arch/mips/mach-mtmips/mt7621/spl/spl.c create mode 100644 arch/mips/mach-mtmips/mt7621/spl/start.S create mode 100644 arch/mips/mach-mtmips/mt7621/sram_init.S create mode 100644 arch/mips/mach-mtmips/mt7621/tpl/Makefile create mode 100644 arch/mips/mach-mtmips/mt7621/tpl/start.S create mode 100644 arch/mips/mach-mtmips/mt7621/tpl/tpl.c create mode 100644 board/mediatek/mt7621/MAINTAINERS create mode 100644 board/mediatek/mt7621/Makefile create mode 100644 board/mediatek/mt7621/board.c create mode 100644 configs/mt7621_nand_rfb_defconfig create mode 100644 configs/mt7621_rfb_defconfig create mode 100644 doc/board/mediatek/mt7621.rst create mode 100644 drivers/clk/mtmips/clk-mt7621.c create mode 100644 drivers/mtd/nand/raw/mt7621_nand.c create mode 100644 drivers/mtd/nand/raw/mt7621_nand.h create mode 100644 drivers/mtd/nand/raw/mt7621_nand_spl.c create mode 100644 drivers/pinctrl/mtmips/pinctrl-mt7621.c create mode 100644 include/configs/mt7621.h create mode 100644 include/dt-bindings/clock/mt7621-clk.h create mode 100644 include/dt-bindings/reset/mt7621-reset.h -- 2.17.1

4 33

[PATCH 00/10] dm: Experiments for reducing SPL memory usage
by Simon Glass 15 May '22

15 May '22

This series explores using the (not yet applied) tag support in driver model to reduce memory usage in SPL. This is particularly important on 64-bit machines, which use a ridiculously large 8 bytes for each pointer into what what is sometimes only 64KB of available memory. The primary focus of this series is struct udevice, which can be shrunk in various ways: - Including devres_head only when DEVRES is enabled (i.e. not in SPL) - Using tags instead of pointers for attached data like plat_, priv_ and driver_data - Using singly linked lists, currently not supported in U-Boot - Using a table index for the driver pointer and uclass pointer Together these bring the size of struct udevice down from 0xa0 (160) bytes to 0x30 (48) bytes. Another option is to drop the device name, although this is a pain for debugging. It would also be possible to implement doubly linked lists with a 16-bit index into malloc space, in SPL, thus reducing the overhead in each node from 16 bytes to 2, or just using a fixed-size list for each data structure, since the number of items is quite limited in SPL. To implement the tag side of things, functions like dev_set_parent_priv() need to be modified to call dev_tag_set_ptr(), and dev_get_parent_priv() needs to call dev_tag_get_ptr(). Note there has been some previous work: - tiny-dm analysis[1] which we decided was too disruptive - build-time instantiation, to reduce SPL code size[2]. [1] https://patchwork.ozlabs.org/project/uboot/cover/20200702211004.1491489-1-s… [2] https://u-boot.readthedocs.io/en/latest/develop/driver-model/of-plat.html#b… AKASHI Takahiro (1): RFC: dm: add tag support Simon Glass (9): Makefile: v2 Allow LTO to be disabled for a build sandbox: Correct loss of early output in SPL Makefile: Drop a stale comment about linking Makefile: Avoid resetting link flags in config.mk sandbox: Allow link flags to be given sandbox: Align linker lists to a 32-byte boundary dm: core: Allow devres to be disabled in SPL dm: core: Deal with a wrinkle with linker lists WIP: dm: core: Add a command to calculate memory usage Makefile | 22 ++-- arch/arm/config.mk | 4 +- arch/arm/include/asm/global_data.h | 2 +- arch/sandbox/config.mk | 4 +- arch/sandbox/cpu/os.c | 2 +- arch/sandbox/cpu/u-boot-spl.lds | 2 +- arch/sandbox/cpu/u-boot.lds | 2 +- cmd/dm.c | 15 ++- common/spl/spl.c | 9 ++ config.mk | 1 - doc/build/gcc.rst | 17 +++ drivers/core/Makefile | 4 +- drivers/core/device.c | 70 +++++++++++- drivers/core/dump.c | 73 +++++++++++++ drivers/core/root.c | 63 ++++++++++- drivers/core/tag.c | 168 +++++++++++++++++++++++++++++ include/asm-generic/global_data.h | 4 + include/dm/device-internal.h | 6 +- include/dm/device.h | 16 ++- include/dm/devres.h | 4 +- include/dm/root.h | 45 ++++++++ include/dm/tag.h | 126 ++++++++++++++++++++++ include/dm/util.h | 9 ++ scripts/Makefile.spl | 2 +- test/dm/Makefile | 2 +- 25 files changed, 640 insertions(+), 32 deletions(-) create mode 100644 drivers/core/tag.c create mode 100644 include/dm/tag.h -- 2.35.1.1021.g381101b075-goog

4 22

[PATCH V3 5/5] board: bsh: Switch to nand spl load instead of romapi
by Michael Trimarchi 15 May '22

15 May '22

romapi is not eble to skip bad block so we need to workaround using the spl Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> --- board/bsh/imx8mn_smm_s2/spl.c | 3 +++ 1 file changed, 3 insertions(+) --- V2->V3: - Add to series and fix if condition V1->V2: - none --- diff --git a/board/bsh/imx8mn_smm_s2/spl.c b/board/bsh/imx8mn_smm_s2/spl.c index 0f61acc630..097b60c055 100644 --- a/board/bsh/imx8mn_smm_s2/spl.c +++ b/board/bsh/imx8mn_smm_s2/spl.c @@ -18,6 +18,9 @@ int spl_board_boot_device(enum boot_device boot_dev_spl) { + if (IS_ENABLED(CONFIG_NAND_MXS) && get_boot_device() != USB_BOOT) + return BOOT_DEVICE_NAND; + return BOOT_DEVICE_BOOTROM; } -- 2.25.1

1 0

[PATCH V3 0/5] MXS nand fixes in SPL
by Michael Trimarchi 15 May '22

15 May '22

Those patches come after some testing of failing in factory on some unit. We found out that the bootrom imx loader was not able to handling badblock. This can be a limit of the implementation right now in imx8mn. Anyway not all the imx platform has the support of this loader. I found some problems on the implementation so I have fixed it up according the experience of Sitara (coming from Dario). I tested only using a Fit Image as a flash container. This version add in the series the fix of cmd_nandbcb and the fix of spl_nand load. I can imagine that a lot of boards and users are affected. I have started to backport this changes in some older uboot and adapt it. Move BSH board using the spl loading instead the romapi Michael Trimarchi (5): nand: raw: mxs_nand: Fix specific hook registration mtd: nand: mxs_nand_spl: Fix bad block skipping arm: mach-imx: cmd_nandbcb fix bad block handling spl: spl_nand: Fix bad block handling in fitImage board: bsh: Switch to nand spl load instead of romapi arch/arm/mach-imx/cmd_nandbcb.c | 21 +++---- board/bsh/imx8mn_smm_s2/spl.c | 3 + common/spl/spl_nand.c | 5 +- drivers/mtd/nand/raw/mxs_nand.c | 32 +++++----- drivers/mtd/nand/raw/mxs_nand_spl.c | 90 ++++++++++++++++------------- 5 files changed, 76 insertions(+), 75 deletions(-) -- 2.25.1

1 5

Ineffective fix of CVE-2019-14196
by zi0Black 15 May '22

15 May '22

Hi to every one, The current fix for the vulnerability identified via CVE-2019-14196 is not effective and a buffer overflow is still possible. Please refer to my comment posted on the commit (5d14ee4e53a81055d34ba280cb8fd90330f22a96) on github. https://github.com/u-boot/u-boot/commit/5d14ee4e53a81055d34ba280cb8fd90330f… Regards, zi0Black

2 1

[PATCH] drivers: ram: rockchip: Fix dram channels calculation for rk3399
by pengphei＠foxmail.com 15 May '22

15 May '22

From: Han Pengfei <pengphei(a)foxmail.com> Only add the dram channel when we finally setup it successfully at the last step. Signed-off-by: Han Pengfei <pengphei(a)foxmail.com> --- drivers/ram/rockchip/sdram_rk3399.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index c0a06dcaed..fd8ba45d68 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -2964,8 +2964,6 @@ static int sdram_init(struct dram_info *dram, if (cap_info->rank == 0) { clear_channel_params(params, 1); continue; - } else { - params->base.num_channels++; } if (IS_ENABLED(CONFIG_RAM_ROCKCHIP_DEBUG)) { @@ -2991,6 +2989,8 @@ static int sdram_init(struct dram_info *dram, printf("no ddrconfig find, Cap not support!\n"); continue; } + + params->base.num_channels++; set_ddrconfig(chan, params, channel, cap_info->ddrconfig); set_cap_relate_config(chan, params, channel); } -- 2.35.3

1 0

[PATCH] imx8mn-*-evk: rename mkimage config
by Heiko Thiery 14 May '22

14 May '22

Since this configuration is used for several imx8mn-evk boards the suffix ddr4 is misleading. Signed-off-by: Heiko Thiery <heiko.thiery(a)gmail.com> --- board/freescale/imx8mn_evk/Kconfig | 2 +- .../imx8mn_evk/{imximage-8mn-ddr4.cfg => imximage-8mn.cfg} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename board/freescale/imx8mn_evk/{imximage-8mn-ddr4.cfg => imximage-8mn.cfg} (100%) diff --git a/board/freescale/imx8mn_evk/Kconfig b/board/freescale/imx8mn_evk/Kconfig index 80037c4401..38312a3662 100644 --- a/board/freescale/imx8mn_evk/Kconfig +++ b/board/freescale/imx8mn_evk/Kconfig @@ -13,7 +13,7 @@ config IMX8MN_LOW_DRIVE_MODE bool "Enable the low drive mode of iMX8MN on EVK board" config IMX_CONFIG - default "board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg" + default "board/freescale/imx8mn_evk/imximage-8mn.cfg" source "board/freescale/common/Kconfig" diff --git a/board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg b/board/freescale/imx8mn_evk/imximage-8mn.cfg similarity index 100% rename from board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg rename to board/freescale/imx8mn_evk/imximage-8mn.cfg -- 2.30.2

3 3

[PATCH v1] sunxi: psci: Fix sunxi_power_switch on sun8i-r40 platform
by qianfanguijin＠163.com 13 May '22

13 May '22

From: qianfan Zhao <qianfanguijin(a)163.com> linux system will dead if we offline one of the cpu on R40 based board: eg: echo 0 > /sys/devices/system/cpu/cpu3/online Fixed sunxi_power_switch based on allwinner lichee 3.10 kernel driver. Signed-off-by: qianfan Zhao <qianfanguijin(a)163.com> --- arch/arm/cpu/armv7/sunxi/psci.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c index 1ac50f558a..63186a9388 100644 --- a/arch/arm/cpu/armv7/sunxi/psci.c +++ b/arch/arm/cpu/armv7/sunxi/psci.c @@ -79,8 +79,7 @@ static void __secure __mdelay(u32 ms) static void __secure clamp_release(u32 __maybe_unused *clamp) { #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \ - defined(CONFIG_MACH_SUN8I_H3) || \ - defined(CONFIG_MACH_SUN8I_R40) + defined(CONFIG_MACH_SUN8I_H3) u32 tmp = 0x1ff; do { tmp >>= 1; @@ -88,15 +87,30 @@ static void __secure clamp_release(u32 __maybe_unused *clamp) } while (tmp); __mdelay(10); +#elif defined(CONFIG_MACH_SUN8I_R40) + u8 i, tmp = 0xfe; + + for (i = 0; i < 5; i++) { /* 0xfe, 0xf8, 0xe0, 0x80, 0x00 */ + writel(tmp, clamp); + tmp <<= 2; + } + + while (0x00 != readl(clamp)) { + ; + } #endif } static void __secure clamp_set(u32 __maybe_unused *clamp) { #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \ - defined(CONFIG_MACH_SUN8I_H3) || \ - defined(CONFIG_MACH_SUN8I_R40) + defined(CONFIG_MACH_SUN8I_H3) writel(0xff, clamp); +#elif defined(CONFIG_MACH_SUN8I_R40) + writel(0xff, clamp); + while (0xff != readl(clamp)) { + ; + } #endif } @@ -153,7 +167,7 @@ static void __secure sunxi_cpu_set_power(int cpu, bool on) sunxi_power_switch((void *)cpucfg + SUN8I_R40_PWR_CLAMP(cpu), (void *)cpucfg + SUN8I_R40_PWROFF, - on, 0); + on, cpu); } #else /* ! CONFIG_MACH_SUN7I && ! CONFIG_MACH_SUN8I_R40 */ static void __secure sunxi_cpu_set_power(int cpu, bool on) -- 2.25.1

2 1

[PATCH] devres: Use the correct devres implementation in SPL builds
by Alban Bedel 13 May '22

13 May '22

When CONFIG_DEVRES is set, but CONFIG_SPL_DM is not set devres code is not included in the SPL. But dm/devres.h only check for CONFIG_DEVRES to select if the full implementation should be used. So if any devres function is used in the SPL with this config the link fails. Fix the ifdef in the dm/devres.h to also check for CONFIG_SPL_DM in SPL builds. Signed-off-by: Alban Bedel <alban.bedel(a)aerq.com> --- include/dm/devres.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/dm/devres.h b/include/dm/devres.h index 0ab277ec38e9..8765b73d5e90 100644 --- a/include/dm/devres.h +++ b/include/dm/devres.h @@ -30,7 +30,8 @@ struct devres_stats { int total_size; }; -#ifdef CONFIG_DEVRES +/* devres is not available in SPL unless DM is enabled there */ +#if defined(CONFIG_DEVRES) && CONFIG_IS_ENABLED(DM) #ifdef CONFIG_DEBUG_DEVRES void *__devres_alloc(dr_release_t release, size_t size, gfp_t gfp, -- 2.32.0

3 2