May 2024 - U-Boot

[ANN] U-Boot v2024.07-rc2 released
by Tom Rini 06 May '24

06 May '24

Hey all, It's release day and here is -rc2. Looking at my own queue, I think I've got everything from there I intend to go in this release. That said, there's still a few PRs I would like to see from others before it gets too much later and if people know of bug fixes that are outstanding still please let me know so I can take a look. In terms of a changelog, git log --merges v2024.07-rc1..v2024.07-rc2 contains what I've pulled but as always, better PR messages and tags will provide better results here. As this is -rc2 I'm opening the -next branch and have synced that to master. I will be pulling in the large series I posted recently to remove include/common.h very soon, and then start grabbing other changes. I expect this to have minimal impact on others and should be easily manually resolved as needed. I hope to remain on schedule and that means the rest of the rcs every other Monday, and with final release on Monday, July 1st, 2024. Thanks all! -- Tom

1 0

[PATCH v2 00/22] rockchip: rk3399: Sync DT with v6.8 and update defconfigs
by Jonas Karlman 06 May '24

06 May '24

This series adds support for new clocks used in Linux kernel v6.8 DTs, sync device trees with v6.8 and updates board defconfigs to enable common features that is known to be working on RK3399 boards. A follow up series will be sent that fully move RK3399 and a few other RK SoCs that recently synced DTs to v6.8 to use OF_UPSTREAM. Changes in v2: - Split series in two, this is the second part - Implement partial instead of dummy support for SCLK_PCIEPHY_REF - Temporarily add ethernet0 alias to rk3399-u-boot.dtsi - Keep dfi node for all boot phases - Only enable AHCI/SCSI on boards that have PCIe slot or board vendor sell a SATA HAT - Collect r-b tags I have runtime tested this series on following devices: - 96boards Rock960 - Khadas Edge Captain - Pine64 PineBook Pro - Pine64 RockPro64 - Radxa ROCK 4C+ - Radxa ROCK 4SE - Radxa ROCK Pi 4A - Radxa ROCK Pi 4B+ Boot times after this series using rock-pi-4-rk3399: => bootstage report Timer summary in microseconds (12 records): Mark Elapsed Stage 172,783 SPL 434,458 261,675 end phase 8,810 8,810 board_init_f 1,381,128 1,372,318 board_init_r 2,304,264 923,136 eth_common_init 2,472,339 168,075 eth_initialize 2,479,534 7,195 main_loop 2,479,847 313 cli_loop Accumulated time: 29,672 dm_spl 893,082 dm_f 12,854 of_live 13,792 dm_r This series depends on the following series: - rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC [1] A copy of this series and its depend can be found at [2] [1] https://patchwork.ozlabs.org/cover/1929673/ [2] https://github.com/Kwiboo/u-boot-rockchip/commits/rk3399-dt-sync-v2-part2 Jonas Karlman (22): clk: rockchip: rk3399: Rename SCLK_DDRCLK to SCLK_DDRC clk: rockchip: rk3399: Add dummy support for ACLK_VDU clock clk: rockchip: rk3399: Improve support for SCLK_PCIEPHY_REF clock clk: rockchip: rk3399: Add SCLK_USB3OTGx_REF support rockchip: rk3399: Sync SoC DT from Linux kernel v6.8 rockchip: rk3399-gru: Sync DT from Linux kernel v6.8 rockchip: rk3399-puma: Sync DT from Linux kernel v6.8 rockchip: rk3399-rock-pi-n10: Sync DT from v6.8 and update defconfig rockchip: rk3399-eaidk-610: Sync DT from v6.8 and update defconfig rockchip: rk3399-leez: Sync DT from v6.8 and update defconfig rockchip: rk3399-evb: Sync DT from v6.8 and update defconfig rockchip: rk3399-firefly: Sync DT from v6.8 and update defconfig rockchip: rk3399-orangepi: Sync DT from v6.8 and update defconfig rockchip: rk3399-roc-pc: Sync DT from v6.8 and update defconfig rockchip: rk3399-nanopi-4: Sync DT from v6.8 and update defconfig rockchip: rk3399-rock960: Sync DT from v6.8 and update defconfig rockchip: rk3399-khadas: Sync DT from v6.8 and update defconfig rockchip: rk3399-rock-pi-4: Sync DT from v6.8 and update defconfig rockchip: rk3399-rockpro64: Sync DT from v6.8 and update defconfig rockchip: rk3399-pinebook-pro: Sync DT from v6.8 and update defconfig rockchip: rk3399-pinephone-pro: Sync DT from v6.8 and update defconfig rockchip: rk3399: Drop ethernet0 alias from SoC u-boot.dtsi arch/arm/dts/rk3288-vmarc-som.dtsi | 48 +++ arch/arm/dts/rk3399-eaidk-610.dts | 3 +- arch/arm/dts/rk3399-evb-u-boot.dtsi | 11 +- arch/arm/dts/rk3399-evb.dts | 3 +- arch/arm/dts/rk3399-ficus.dts | 4 + arch/arm/dts/rk3399-firefly.dts | 17 +- arch/arm/dts/rk3399-gru-bob.dts | 8 +- arch/arm/dts/rk3399-gru-chromebook.dtsi | 200 +++++++++++- arch/arm/dts/rk3399-gru-kevin.dts | 3 +- arch/arm/dts/rk3399-gru-u-boot.dtsi | 10 +- arch/arm/dts/rk3399-gru.dtsi | 52 +++- arch/arm/dts/rk3399-khadas-edge-captain.dts | 4 + arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi | 5 + arch/arm/dts/rk3399-khadas-edge-v.dts | 4 + arch/arm/dts/rk3399-khadas-edge.dtsi | 10 +- arch/arm/dts/rk3399-leez-p710.dts | 8 +- arch/arm/dts/rk3399-nanopc-t4.dts | 2 +- arch/arm/dts/rk3399-nanopi-m4-2gb.dts | 55 +--- arch/arm/dts/rk3399-nanopi-m4b.dts | 2 +- arch/arm/dts/rk3399-nanopi-r4s.dts | 4 +- arch/arm/dts/rk3399-nanopi4-u-boot.dtsi | 4 + arch/arm/dts/rk3399-nanopi4.dtsi | 7 +- arch/arm/dts/rk3399-op1-opp.dtsi | 31 +- arch/arm/dts/rk3399-opp.dtsi | 6 +- arch/arm/dts/rk3399-orangepi.dts | 12 +- arch/arm/dts/rk3399-pinebook-pro.dts | 24 +- arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 12 + arch/arm/dts/rk3399-pinephone-pro.dts | 147 +++++++++ arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 16 +- arch/arm/dts/rk3399-puma-haikou.dts | 42 ++- arch/arm/dts/rk3399-puma.dtsi | 17 +- arch/arm/dts/rk3399-roc-pc.dtsi | 15 +- arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 12 + arch/arm/dts/rk3399-rock-4c-plus.dts | 1 + arch/arm/dts/rk3399-rock-4se-u-boot.dtsi | 12 + arch/arm/dts/rk3399-rock-pi-4.dtsi | 4 +- arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi | 7 + arch/arm/dts/rk3399-rock-pi-4c.dts | 10 + arch/arm/dts/rk3399-rock960.dtsi | 5 +- arch/arm/dts/rk3399-rockpro64.dtsi | 98 +++++- arch/arm/dts/rk3399-u-boot.dtsi | 54 ++-- arch/arm/dts/rk3399.dtsi | 289 ++++++++++++++++-- arch/arm/dts/rk3399pro-vmarc-som.dtsi | 20 +- .../dts/rockchip-radxa-dalang-carrier.dtsi | 21 ++ configs/eaidk-610-rk3399_defconfig | 11 +- configs/evb-rk3399_defconfig | 6 +- configs/ficus-rk3399_defconfig | 22 +- configs/firefly-rk3399_defconfig | 9 +- configs/khadas-edge-captain-rk3399_defconfig | 29 +- configs/khadas-edge-rk3399_defconfig | 27 +- configs/khadas-edge-v-rk3399_defconfig | 29 +- configs/leez-rk3399_defconfig | 10 +- configs/nanopc-t4-rk3399_defconfig | 10 +- configs/nanopi-m4-2gb-rk3399_defconfig | 18 +- configs/nanopi-m4-rk3399_defconfig | 18 +- configs/nanopi-m4b-rk3399_defconfig | 18 +- configs/nanopi-neo4-rk3399_defconfig | 11 +- configs/nanopi-r4s-rk3399_defconfig | 11 +- configs/orangepi-rk3399_defconfig | 10 +- configs/pinebook-pro-rk3399_defconfig | 6 +- configs/pinephone-pro-rk3399_defconfig | 8 +- configs/roc-pc-mezzanine-rk3399_defconfig | 7 +- configs/roc-pc-rk3399_defconfig | 7 +- configs/rock-4c-plus-rk3399_defconfig | 24 +- configs/rock-4se-rk3399_defconfig | 23 +- configs/rock-pi-4-rk3399_defconfig | 8 + configs/rock-pi-4c-rk3399_defconfig | 24 +- configs/rock-pi-n10-rk3399pro_defconfig | 8 +- configs/rock960-rk3399_defconfig | 10 +- configs/rockpro64-rk3399_defconfig | 7 +- drivers/clk/rockchip/clk_rk3399.c | 67 +++- include/dt-bindings/clock/rk3399-cru.h | 30 +- 72 files changed, 1462 insertions(+), 325 deletions(-) -- 2.43.2

6 29

[GIT PULL] Please pull u-boot-imx-master-20240505
by Fabio Estevam 06 May '24

06 May '24

Hi Tom, Please pull from u-boot-imx/master, thanks. The following changes since commit 2f1e76bcfee75b9f99ade63002c05ffaaec86afb: Merge branch '2024-05-02-assorted-updates' (2024-05-03 16:18:51 -0600) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-master-20240505 for you to fetch changes up to cecb5fbb42c8b3de3d5a7df40bc01d1fdf4731d3: crypto/fsl: Differentiate between CAAM and DCP in Kconfig entry (2024-05-05 11:21:39 -0300) u-boot-imx-master-20240505 -------------------------- CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/20614 - Add SPL variant of DM_RNG so that the DM_RNG can be disabled in SPL if necessary. This may be necessary due to e.g. size constraints of the SPL. - dd SPL variant of SPL_FSL_CAAM_RNG so that the SPL_FSL_CAAM_RNG can be disabled in SPL if necessary. This may be necessary due to e.g. size constraints of the SPL. - Differentiate between CAAM and DCP in Kconfig entry. ---------------------------------------------------------------- Marek Vasut (3): rng: Introduce SPL_DM_RNG crypto/fsl: Introduce SPL_FSL_CAAM_RNG crypto/fsl: Differentiate between CAAM and DCP in Kconfig entry boot/pxe_utils.c | 4 +--- boot/vbe_request.c | 2 +- drivers/Makefile | 2 +- drivers/crypto/fsl/Kconfig | 11 +++++++++-- drivers/crypto/fsl/Makefile | 2 +- drivers/crypto/fsl/jr.c | 4 ++-- drivers/rng/Kconfig | 7 +++++++ drivers/rng/Makefile | 2 +- lib/uuid.c | 2 +- net/net_rand.h | 2 +- test/dm/Makefile | 2 +- 11 files changed, 26 insertions(+), 14 deletions(-)

2 1

[PATCH v3 0/3] Introduce mtdblock device
by Alexey Romanov 06 May '24

06 May '24

Hello! This series adds support for the mtdblock device, which allows to read/write data block by block. For example, it can now be used for BCB or Android AB command: $ bcb load mtd 0 part_name Tested only on SPI NAND, so bind is made only for SPI NAND drivers. --- Changes V1 -> V2 [1]: - Drop patch [2]. - Add warning if bind NAND mtdblock device. - Move documentation of mtdblock implementation from commit message to the source code. - Remove __maybe_unused from mtd partition functions description. - Use blk_enabled() instead of #ifdefs. Changes V2 -> V3 [2]: - Rebased over [3]. - Rename mtd_bread/bwrite -> mtd_blk_read/write. - Fix GPL-2.0 license short name definiton in headers. - Add empty line after MTD_ENTRY_NUMBERS define. Links: - [1] https://lore.kernel.org/all/20240227100441.1811047-1-avromanov@salutedevice… - [2] https://lore.kernel.org/all/20240227100441.1811047-5-avromanov@salutedevice… - [3] https://lore.kernel.org/u-boot/20240403114047.84030-1-heinrich.schuchardt@c… Alexey Romanov (3): disk: support MTD partitions drivers: introduce mtdblock abstraction spinand: bind mtdblock disk/part.c | 3 +- drivers/block/blk-uclass.c | 1 + drivers/mtd/Kconfig | 1 + drivers/mtd/Makefile | 1 + drivers/mtd/mtdblock.c | 227 ++++++++++++++++++++++++++++++++++++ drivers/mtd/mtdpart.c | 69 +++++++++++ drivers/mtd/nand/spi/core.c | 20 ++++ include/linux/mtd/mtd.h | 12 ++ include/part.h | 3 + 9 files changed, 336 insertions(+), 1 deletion(-) create mode 100644 drivers/mtd/mtdblock.c -- 2.34.1

2 6

[PATCH v2 00/18] rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC
by Jonas Karlman 06 May '24

06 May '24

This series enables use of FIT signature check for checksum validation in SPL and fixes loading FIT from SD-card when loading FIT from eMMC or SPI flash fails. Changes in v2: - Split series in two, this is the first part, second part will follow - Split a big patch into smaller and more reviewable parts - Change rk3399-puma to use common bss and stack addresses - Skip UART related pinctrl nodes at pre-reloc phase to not slow down boot for i.e. rk3399-puma - Rebase on latest master branch - Collect r-b tags I have runtime tested this series on following devices: - 96boards Rock960 - Khadas Edge Captain - Pine64 PineBook Pro - Pine64 RockPro64 - Radxa ROCK 4C+ - Radxa ROCK 4SE - Radxa ROCK Pi 4A - Radxa ROCK Pi 4B+ Boot times before this series using rock-pi-4-rk3399: => bootstage report Timer summary in microseconds (11 records): Mark Elapsed Stage 204,349 SPL 494,212 289,863 end phase 8,637 8,637 board_init_f 1,314,991 1,306,354 board_init_r 3,483,389 2,168,398 eth_common_init 3,814,525 331,136 eth_initialize 3,814,762 237 main_loop 3,823,030 8,268 cli_loop Accumulated time: 22,295 dm_spl 852,152 dm_f 60,268 dm_r After this series the boot time have improved, mostly thanks to the use of ARMv8 crypto, OF_LIVE and reduced clutter in FDT: => bootstage report Timer summary in microseconds (12 records): Mark Elapsed Stage 165,322 SPL 419,002 253,680 end phase 8,620 8,620 board_init_f 1,314,364 1,305,744 board_init_r 2,234,295 919,931 eth_common_init 2,399,375 165,080 eth_initialize 2,406,203 6,828 main_loop 2,406,499 296 cli_loop Accumulated time: 28,365 dm_spl 864,210 dm_f 11,943 of_live 13,085 dm_r After this the board still spend a long time waiting for timeout during probe of display/hdmi driver (~1200 ms) or reading FDT during pre-reloc phase (~600ms). A copy of this series can be found at [1]. [1] https://github.com/Kwiboo/u-boot-rockchip/commits/rk3399-dt-sync-v2-part1 Jonas Karlman (18): rockchip: rk3399-gru: Fix max SPL size on bob and kevin rockchip: rk3399-puma: Update SPL_PAD_TO Kconfig option rockchip: rk3399-puma: Use common bss and stack addresses rockchip: rk3399-ficus: Enable TPL and use common bss and stack addr rockchip: rk3399: Sort imply statements alphabetically rockchip: rk3399: Enable ARMv8 crypto and FIT checksum validation rockchip: rk3399: Enable random generator on all boards rockchip: rk3399: Imply support for GbE PHY rockchip: rk3399: Enable DT overlay support on all boards rockchip: rk3399: Remove use of xPL_MISC_DRIVERS options rockchip: rk3399: Add a default spl-boot-order prop rockchip: rk3399: Remove inherited bootph-all props rockchip: rk3399: Sort nodes in u-boot.dtsi files rockchip: rk3399: Fix bootph prop for vop nodes rockchip: rk3399-puma: Move uart0 bootph to board u-boot.dtsi rockchip: rk3399: Include uart related pinctrl nodes in TPL/SPL rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC rockchip: rk3399: Configure sdmmc regulator pinctrl in SPL arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi | 1 - arch/arm/dts/rk3399-evb-u-boot.dtsi | 26 +++-- arch/arm/dts/rk3399-ficus-u-boot.dtsi | 12 ++- arch/arm/dts/rk3399-firefly-u-boot.dtsi | 6 -- arch/arm/dts/rk3399-gru-u-boot.dtsi | 24 +++++ arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi | 6 -- arch/arm/dts/rk3399-leez-p710-u-boot.dtsi | 6 -- arch/arm/dts/rk3399-nanopi4-u-boot.dtsi | 14 ++- arch/arm/dts/rk3399-orangepi-u-boot.dtsi | 12 +++ arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 23 ++-- arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 12 --- arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 25 ++--- arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 31 ++++-- arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 10 ++ arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi | 6 -- arch/arm/dts/rk3399-rock960-u-boot.dtsi | 13 ++- arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 22 ++-- arch/arm/dts/rk3399-u-boot.dtsi | 101 +++++++++++++----- .../arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi | 6 -- arch/arm/mach-rockchip/Kconfig | 36 ++++--- configs/chromebook_bob_defconfig | 6 +- configs/chromebook_kevin_defconfig | 6 +- configs/eaidk-610-rk3399_defconfig | 2 +- configs/evb-rk3399_defconfig | 4 +- configs/ficus-rk3399_defconfig | 16 +-- configs/firefly-rk3399_defconfig | 4 +- configs/khadas-edge-captain-rk3399_defconfig | 2 +- configs/khadas-edge-rk3399_defconfig | 2 +- configs/khadas-edge-v-rk3399_defconfig | 2 +- configs/leez-rk3399_defconfig | 3 +- configs/nanopc-t4-rk3399_defconfig | 4 +- configs/nanopi-m4-2gb-rk3399_defconfig | 4 +- configs/nanopi-m4-rk3399_defconfig | 4 +- configs/nanopi-m4b-rk3399_defconfig | 4 +- configs/nanopi-neo4-rk3399_defconfig | 4 +- configs/nanopi-r4s-rk3399_defconfig | 4 +- configs/orangepi-rk3399_defconfig | 4 +- configs/pinebook-pro-rk3399_defconfig | 7 +- configs/pinephone-pro-rk3399_defconfig | 5 +- configs/puma-rk3399_defconfig | 14 +-- configs/roc-pc-mezzanine-rk3399_defconfig | 4 +- configs/roc-pc-rk3399_defconfig | 6 +- configs/rock-4c-plus-rk3399_defconfig | 3 +- configs/rock-4se-rk3399_defconfig | 5 +- configs/rock-pi-4-rk3399_defconfig | 5 +- configs/rock-pi-4c-rk3399_defconfig | 3 +- configs/rock-pi-n10-rk3399pro_defconfig | 2 +- configs/rock960-rk3399_defconfig | 4 +- configs/rockpro64-rk3399_defconfig | 9 +- 49 files changed, 298 insertions(+), 236 deletions(-) -- 2.43.2

3 34

[PATCH 1/3] rng: Introduce SPL_DM_RNG
by Marek Vasut 05 May '24

05 May '24

Add SPL variant of DM_RNG so that the DM_RNG can be disabled in SPL if necessary. This may be necessary due to e.g. size constraints of the SPL. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Angelo Dureghello <angelo(a)kernel-space.org> Cc: Emanuele Ghidoli <emanuele.ghidoli(a)toradex.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Gaurav Jain <gaurav.jain(a)nxp.com> Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Cc: Marek Vasut <marex(a)denx.de> Cc: Michal Simek <michal.simek(a)amd.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Stefan Roese <sr(a)denx.de> Cc: Sughosh Ganu <sughosh.ganu(a)linaro.org> Cc: Svyatoslav Ryhel <clamor95(a)gmail.com> Cc: Tim Harvey <tharvey(a)gateworks.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)lists.denx.de --- boot/pxe_utils.c | 4 +--- boot/vbe_request.c | 2 +- drivers/Makefile | 2 +- drivers/crypto/fsl/jr.c | 4 ++-- drivers/rng/Kconfig | 7 +++++++ drivers/rng/Makefile | 2 +- lib/uuid.c | 2 +- net/net_rand.h | 2 +- test/dm/Makefile | 2 +- 9 files changed, 16 insertions(+), 11 deletions(-) diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 96205626750..5c1c962ff4c 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -21,9 +21,7 @@ #include <errno.h> #include <linux/list.h> -#ifdef CONFIG_DM_RNG #include <rng.h> -#endif #include <splash.h> #include <asm/io.h> @@ -323,7 +321,7 @@ static int label_localboot(struct pxe_label *label) static void label_boot_kaslrseed(void) { -#ifdef CONFIG_DM_RNG +#if CONFIG_IS_ENABLED(DM_RNG) ulong fdt_addr; struct fdt_header *working_fdt; size_t n = 0x8; diff --git a/boot/vbe_request.c b/boot/vbe_request.c index 917251afa1c..0293ac6c869 100644 --- a/boot/vbe_request.c +++ b/boot/vbe_request.c @@ -36,7 +36,7 @@ static int handle_random_req(ofnode node, int default_size, u32 size; int ret; - if (!IS_ENABLED(CONFIG_DM_RNG)) + if (!CONFIG_IS_ENABLED(DM_RNG)) return -ENOTSUPP; if (ofnode_read_u32(node, "vbe,size", &size)) { diff --git a/drivers/Makefile b/drivers/Makefile index bf73b7718ce..9195dafd37e 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -126,7 +126,7 @@ obj-$(CONFIG_W1_EEPROM) += w1-eeprom/ obj-$(CONFIG_MACH_PIC32) += ddr/microchip/ obj-$(CONFIG_FUZZ) += fuzz/ obj-$(CONFIG_DM_HWSPINLOCK) += hwspinlock/ -obj-$(CONFIG_DM_RNG) += rng/ +obj-$(CONFIG_$(SPL_TPL_)DM_RNG) += rng/ endif obj-y += soc/ diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 203f1625215..8ae5c434bdb 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -787,7 +787,7 @@ init: } #if CONFIG_IS_ENABLED(OF_CONTROL) if (ofnode_valid(scu_node)) { - if (IS_ENABLED(CONFIG_DM_RNG)) { + if (CONFIG_IS_ENABLED(DM_RNG)) { ret = device_bind_driver(NULL, "caam-rng", "caam-rng", NULL); if (ret) printf("Couldn't bind rng driver (%d)\n", ret); @@ -810,7 +810,7 @@ init: return -1; } - if (IS_ENABLED(CONFIG_DM_RNG)) { + if (CONFIG_IS_ENABLED(DM_RNG)) { ret = device_bind_driver(NULL, "caam-rng", "caam-rng", NULL); if (ret) diff --git a/drivers/rng/Kconfig b/drivers/rng/Kconfig index cd72852a479..5758ae192a6 100644 --- a/drivers/rng/Kconfig +++ b/drivers/rng/Kconfig @@ -6,6 +6,13 @@ config DM_RNG This interface is used to initialise the rng device and to read the random seed from the device. +config SPL_DM_RNG + bool "Driver support for Random Number Generator devices in SPL" + depends on SPL_DM + help + This option is an SPL-variant of the DM_RNG option. + See the help of DM_RNG for details. + if DM_RNG config RNG_MESON diff --git a/drivers/rng/Makefile b/drivers/rng/Makefile index ecae1a3da33..c1f1c616e00 100644 --- a/drivers/rng/Makefile +++ b/drivers/rng/Makefile @@ -3,7 +3,7 @@ # Copyright (c) 2019, Linaro Limited # -obj-$(CONFIG_DM_RNG) += rng-uclass.o +obj-$(CONFIG_$(SPL_TPL_)DM_RNG) += rng-uclass.o obj-$(CONFIG_RNG_MESON) += meson-rng.o obj-$(CONFIG_RNG_SANDBOX) += sandbox_rng.o obj-$(CONFIG_RNG_MSM) += msm_rng.o diff --git a/lib/uuid.c b/lib/uuid.c index 2d7d99535e7..dfa2320ba26 100644 --- a/lib/uuid.c +++ b/lib/uuid.c @@ -378,7 +378,7 @@ void gen_rand_uuid(unsigned char *uuid_bin) struct udevice *devp; u32 randv = 0; - if (IS_ENABLED(CONFIG_DM_RNG)) { + if (CONFIG_IS_ENABLED(DM_RNG)) { ret = uclass_get_device(UCLASS_RNG, 0, &devp); if (!ret) { ret = dm_rng_read(devp, &randv, sizeof(randv)); diff --git a/net/net_rand.h b/net/net_rand.h index d3c5559adfd..686e85f2b53 100644 --- a/net/net_rand.h +++ b/net/net_rand.h @@ -42,7 +42,7 @@ static inline void srand_mac(void) struct udevice *devp; u32 randv = 0; - if (IS_ENABLED(CONFIG_DM_RNG)) { + if (CONFIG_IS_ENABLED(DM_RNG)) { ret = uclass_get_device(UCLASS_RNG, 0, &devp); if (ret) { ret = dm_rng_read(devp, &randv, sizeof(randv)); diff --git a/test/dm/Makefile b/test/dm/Makefile index a3ce7b3889f..c12589d487c 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -102,7 +102,7 @@ obj-$(CONFIG_DM_RESET) += reset.o obj-$(CONFIG_SYSRESET) += sysreset.o obj-$(CONFIG_DM_REGULATOR) += regulator.o obj-$(CONFIG_CMD_RKMTD) += rkmtd.o -obj-$(CONFIG_DM_RNG) += rng.o +obj-$(CONFIG_$(SPL_TPL_)DM_RNG) += rng.o obj-$(CONFIG_DM_RTC) += rtc.o obj-$(CONFIG_SCMI_FIRMWARE) += scmi.o obj-$(CONFIG_SCSI) += scsi.o -- 2.43.0

5 11

[PATCH] configs: am62x_evm_r5: Increase size of malloc_simple heap after relocation
by Judith Mendez 04 May '24

04 May '24

On AM62x SK we can see a boot failure with signature "alloc space exhausted", so fix by increasing size of SPL_STACK_R_MALLOC_SIMPLE_LEN. Fixes: 128f81290b ("arm: dts: k3: binman: am625: add support for signing TIFSSTUB Images") Signed-off-by: Judith Mendez <jm(a)ti.com> --- configs/am62x_evm_r5_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/am62x_evm_r5_defconfig b/configs/am62x_evm_r5_defconfig index 4b2e57b13a0..648241488ed 100644 --- a/configs/am62x_evm_r5_defconfig +++ b/configs/am62x_evm_r5_defconfig @@ -26,6 +26,7 @@ CONFIG_SPL_HAS_BSS_LINKER_SECTION=y CONFIG_SPL_BSS_START_ADDR=0x43c3b000 CONFIG_SPL_BSS_MAX_SIZE=0x3000 CONFIG_SPL_STACK_R=y +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000 CONFIG_SPL_SIZE_LIMIT=0x3A7F0 CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x3500 CONFIG_SPL_FS_FAT=y base-commit: 174ac987655c888017c82df1883c0c2ea0dc2495 -- 2.43.2

4 3

[PATCH 1/1] net: consider option-length when parsing NIS domain
by Heinrich Schuchardt 04 May '24

04 May '24

When parsing option 40 (network information service domain) the option length is in variable 'oplen' and not in 'size'. Addresses-Coverity-ID: 492765 Uninitialized variables (UNINIT) Fixes: 8ab388bfdbcf ("net: add support to parse the NIS domain for the dhcp options") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- net/bootp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/bootp.c b/net/bootp.c index c15472f5d37..86c56803c76 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -886,7 +886,7 @@ static void dhcp_process_options(uchar *popt, uchar *end) case 40: /* NIS Domain name */ if (net_nis_domain[0] == 0) { size = truncate_sz("NIS Domain Name", - sizeof(net_nis_domain), size); + sizeof(net_nis_domain), oplen); memcpy(&net_nis_domain, popt + 2, size); net_nis_domain[size] = 0; } -- 2.43.0

2 1

[PATCH v1 0/3] Arm: npcm: modify npcm mem and boot issue
by Jim Liu 04 May '24

04 May '24

1. Modify npcm memory setting 2. Fix boot error Jim Liu (3): Arm: npcm: fix npcm7xx boot to kernel error configs: arbel: increase u-boot mapping size board: arbel: Limit the dram effective size to bank0 maximal size board/nuvoton/arbel_evb/arbel_evb.c | 14 +++++++++----- board/nuvoton/poleg_evb/poleg_evb.c | 27 ++++++++++++++++++++------- include/configs/arbel.h | 2 +- include/configs/poleg.h | 4 ++-- 4 files changed, 32 insertions(+), 15 deletions(-) -- 2.25.1

2 6

[PATCH] MAINTAINERS: update Broadcom BCMBCA maintainer
by William Zhang 04 May '24

04 May '24

Joel is no longer with Broadcom. Remove his email from bcmbca maintainer list and replace him with myself for stack protection maintainer. Signed-off-by: William Zhang <william.zhang(a)broadcom.com> --- MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 921ce05755a6..7a3b4d3712c7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -224,7 +224,6 @@ ARM BROADCOM BCMBCA M: Anand Gore <anand.gore(a)broadcom.com> M: William Zhang <william.zhang(a)broadcom.com> M: Kursad Oney <kursad.oney(a)broadcom.com> -M: Joel Peshkin <joel.peshkin(a)broadcom.com> M: Philippe Reynes <philippe.reynes(a)softathome.com> S: Maintained F: arch/arm/mach-bcmbca/ @@ -1568,7 +1567,7 @@ F: cmd/sqfs.c F: test/py/tests/test_fs/test_squashfs/ STACKPROTECTOR -M: Joel Peshkin <joel.peshkin(a)broadcom.com> +M: William Zhang <william.zhang(a)broadcom.com> S: Maintained F: common/stackprot.c F: cmd/stackprot_test.c -- 2.37.3

2 1