]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge tag 'u-boot-rockchip-2026.10-20260724' of https://git.u-boot-project.org/u...
authorTom Rini <trini@konsulko.com>
Mon, 27 Jul 2026 17:05:58 +0000 (11:05 -0600)
committerTom Rini <trini@konsulko.com>
Mon, 27 Jul 2026 17:05:58 +0000 (11:05 -0600)
- Switched to use upstream pinctrl header include,
- Dropped SDHCI DT properties in U-Boot-specific DT for NanoPi R5 as
  most are present upstream and those which aren't are breaking devices,
- Fixed ECC strength mismatch between reading and writing on non-0
  NAND chips configured as boot medium (nand-is-boot-medium),
- Moved Simon to reviewer for ARM ROCKCHIP,
- Fixed build issue related to GPT capsule support accessing a struct
  member only present when CONFIG_PARTITION_TYPE_GUID is set,
- Added support for new devices:
  - Anbernic RG-DS
  - ROC-RK3588S-PC

1  2 
MAINTAINERS
doc/board/rockchip/rockchip.rst

diff --cc MAINTAINERS
index 87cd487c5f3a1406e80ca4e0ad40dbf78b9e6c0a,d9ff6b4f8282f976d2cc2fbaedb9ffddcf999d97..289a45f47bb1c2901838f37869f964924a12eb41
@@@ -520,11 -554,11 +520,11 @@@ F:      drivers/sysinfo/rcar3.
  F:    drivers/usb/host/xhci-rcar*
  
  ARM ROCKCHIP
- M:    Simon Glass <sjg@chromium.org>
  M:    Quentin Schulz <u-boot@0leil.net>
  M:    Kever Yang <kever.yang@rock-chips.com>
+ R:    Simon Glass <sjg@chromium.org>
  S:    Maintained
 -T:    git https://source.denx.de/u-boot/custodians/u-boot-rockchip.git
 +T:    git https://git.u-boot-project.org/u-boot/custodians/u-boot-rockchip.git
  # Exclude from N: px5 matches
  X:    configs/kmsupx5_defconfig
  N:    px30
Simple merge