Merge tag 'v2026.07-rc3' into next

Prepare v2026.07-rc3

10 files changed, 28 insertions, 123 deletions

diff --git a/doc/CONTRIBUTE.rst b/doc/CONTRIBUTE.rst
index a47dfdca221..a6e1cd1fb68 100644
--- a/doc/CONTRIBUTE.rst
+++ b/doc/CONTRIBUTE.rst
@@ -22,7 +22,7 @@ Repository
 The official U-Boot repository is located at https://source.denx.de/u-boot/u-boot
 
 Further more detailed documentation can be found at the following link:
-https://docs.u-boot.org/en/latest/index.html
+https://docs.u-boot-project.org/en/latest/index.html
 
 Contributions
 -------------
diff --git a/doc/README.gpt b/doc/README.gpt
index 386ac2e0fc8..a6e1fd7ce8d 100644
--- a/doc/README.gpt
+++ b/doc/README.gpt
@@ -286,6 +286,8 @@ Some strings can be also used at the place of known GUID :
 	                    (E6D6D379-F507-44C2-A23C-238F2A3DF928)
 	"u-boot-env"      = PARTITION_U_BOOT_ENVIRONMENT
 	                    (3DE21764-95BD-54BD-A5C3-4ABE786F38A8)
+	"xbootldr"        = PARTITION_XBOOTLDR
+	                    (BC13C2FF-59E6-4262-A352-B275FD6F7172)
 
     "uuid_disk=...;name=u-boot,size=60MiB,uuid=...;
 	name=kernel,size=60MiB,uuid=...,type=linux;"
diff --git a/doc/board/apple/m1.rst b/doc/board/apple/m1.rst
index 8fa7637629e..900c5e6d91e 100644
--- a/doc/board/apple/m1.rst
+++ b/doc/board/apple/m1.rst
@@ -8,21 +8,24 @@ developed by the Asahi Linux project.  At this point the machines with
 the following SoCs work:
 
  - Apple M1 SoC (t8103)
+ - Apple M2 SoC (t8112)
  - Apple M1 Pro SoC (t6000)
  - Apple M1 Max SoC (t6001)
  - Apple M1 Ultra SoC (t6002)
+ - Apple M2 Pro SoC (t6020)
+ - Apple M2 Max SoC (t6021)
+ - Apple M2 Ultra SoC (t6022)
 
 On these SoCs the following hardware is supported:
 
  - S5L serial port
- - SPI keyboard (on laptops)
+ - SPI keyboard (on M1 laptops)
  - Framebuffer
  - NVMe storage
  - USB 3.1 Type-C ports
 
-Device trees are currently provided for the M1 Mac mini (2020, J274),
-M1 MacBook Pro 13" (2020, J293), M1 MacBook Air (2020, J313) and M1
-iMac (2021, J456/J457).
+Device trees are provided in dts/upstream/src/arm64/apple/ and available
+for all M1 and M2 (t8103, t8112, t600x and t602x) devices.
 
 Building U-Boot
 ---------------
@@ -77,7 +80,7 @@ supported SoCs.
 
    * - SoC
      - Base Address
-   * - M1 (t8103)
+   * - M1 (t8103) and M2 (t8112)
      - 0x235200000
-   * - M1 Pro/Max/Ultra (t6000/t6001/t6002)
+   * - M1 Pro/Max/Ultra (t6000/t6001/t6002) and M2 Pro/Max/Ultra (t6020/t6021/t6022)
      - 0x39b200000
diff --git a/doc/build/documentation.rst b/doc/build/documentation.rst
index b55a4666643..65f767440bd 100644
--- a/doc/build/documentation.rst
+++ b/doc/build/documentation.rst
@@ -40,7 +40,7 @@ The *htmldocs* target is used to build the HTML documentation. It uses the
     # Display the documentation in a graphical web browser
     x-www-browser doc/output/index.html
 
-The HTML documentation is published at https://docs.u-boot.org. The build
+The HTML documentation is published at https://docs.u-boot-project.org. The build
 process for that site is controlled by the file *.readthedocs.yml*.
 
 Infodoc documentation
diff --git a/doc/develop/release_cycle.rst b/doc/develop/release_cycle.rst
index 9a3ebd7e5f8..b53eac45504 100644
--- a/doc/develop/release_cycle.rst
+++ b/doc/develop/release_cycle.rst
@@ -75,7 +75,7 @@ For the next scheduled release, release candidates were made on:
 
 * U-Boot |next_ver|-rc2 was released on Mon 11 May 2026.
 
-.. * U-Boot |next_ver|-rc3 was released on Mon 25 May 2026.
+* U-Boot |next_ver|-rc3 was released on Mon 25 May 2026.
 
 .. * U-Boot |next_ver|-rc4 was released on Mon 08 June 2026.
 
diff --git a/doc/device-tree-bindings/bootcount-syscon.txt b/doc/device-tree-bindings/bootcount-syscon.txt
index ea27b246c8a..8e6060a711e 100644
--- a/doc/device-tree-bindings/bootcount-syscon.txt
+++ b/doc/device-tree-bindings/bootcount-syscon.txt
@@ -1,6 +1,6 @@
 Bootcount Configuration
 This is the implementation of the feature as described in
-https://docs.u-boot.org/en/latest/api/bootcount.html
+https://docs.u-boot-project.org/en/latest/api/bootcount.html
 
 Required Properties:
 - compatible: must be "u-boot,bootcount-syscon".
diff --git a/doc/device-tree-bindings/pinctrl/apple,pinctrl.yaml b/doc/device-tree-bindings/pinctrl/apple,pinctrl.yaml
deleted file mode 100644
index d50571affd1..00000000000
--- a/doc/device-tree-bindings/pinctrl/apple,pinctrl.yaml
+++ /dev/null
@@ -1,106 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-%YAML 1.2
----
-$id: http://devicetree.org/schemas/pinctrl/apple,pinctrl.yaml#
-$schema: http://devicetree.org/meta-schemas/core.yaml#
-
-title: Apple GPIO controller
-
-maintainers:
-  - Mark Kettenis <[email protected]>
-
-description: |
-  The Apple GPIO controller is a simple combined pin and GPIO
-  controller present on Apple ARM SoC platforms, including various
-  iPhone and iPad devices and the "Apple Silicon" Macs.
-
-properties:
-  compatible:
-    items:
-      - const: apple,t8103-pinctrl
-      - const: apple,pinctrl
-
-  reg:
-    maxItems: 1
-
-  clocks:
-    maxItems: 1
-
-  gpio-controller: true
-
-  '#gpio-cells':
-    const: 2
-
-  gpio-ranges:
-    maxItems: 1
-
-  interrupts:
-    description: One interrupt for each of the (up to 7) interrupt
-      groups supported by the controller sorted by interrupt group
-      number in ascending order.
-    minItems: 1
-    maxItems: 7
-
-  interrupt-controller: true
-
-patternProperties:
-  '-pins$':
-    type: object
-    $ref: pinmux-node.yaml#
-
-    properties:
-      pinmux:
-        description:
-          Values are constructed from pin number and alternate function
-          configuration number using the APPLE_PINMUX() helper macro
-          defined in include/dt-bindings/pinctrl/apple.h.
-
-    required:
-      - pinmux
-
-    additionalProperties: false
-
-required:
-  - compatible
-  - reg
-  - gpio-controller
-  - '#gpio-cells'
-  - gpio-ranges
-
-additionalProperties: false
-
-examples:
-  - |
-    #include <dt-bindings/interrupt-controller/apple-aic.h>
-    #include <dt-bindings/pinctrl/apple.h>
-
-    soc {
-      #address-cells = <2>;
-      #size-cells = <2>;
-
-      pinctrl: pinctrl@23c100000 {
-        compatible = "apple,t8103-pinctrl", "apple,pinctrl";
-        reg = <0x2 0x3c100000 0x0 0x100000>;
-        clocks = <&gpio_clk>;
-
-        gpio-controller;
-        #gpio-cells = <2>;
-        gpio-ranges = <&pinctrl 0 0 212>;
-
-        interrupt-controller;
-        interrupt-parent = <&aic>;
-        interrupts = <AIC_IRQ 16 IRQ_TYPE_LEVEL_HIGH>,
-                     <AIC_IRQ 17 IRQ_TYPE_LEVEL_HIGH>,
-                     <AIC_IRQ 18 IRQ_TYPE_LEVEL_HIGH>,
-                     <AIC_IRQ 19 IRQ_TYPE_LEVEL_HIGH>,
-                     <AIC_IRQ 20 IRQ_TYPE_LEVEL_HIGH>,
-                     <AIC_IRQ 21 IRQ_TYPE_LEVEL_HIGH>,
-                     <AIC_IRQ 22 IRQ_TYPE_LEVEL_HIGH>;
-
-        pcie_pins: pcie-pins {
-          pinmux = <APPLE_PINMUX(150, 1)>,
-                   <APPLE_PINMUX(151, 1)>,
-                   <APPLE_PINMUX(32, 1)>;
-        };
-      };
-    };
diff --git a/doc/mkeficapsule.1 b/doc/mkeficapsule.1
index d6653ec4247..ed296730eeb 100644
--- a/doc/mkeficapsule.1
+++ b/doc/mkeficapsule.1
@@ -153,4 +153,4 @@ The directory in which all capsule files be placed
 Written by AKASHI Takahiro <[email protected]>
 
 .SH HOMEPAGE
-http://www.u-boot.org/
+http://www.u-boot-project.org/
diff --git a/doc/usage/cmd/part.rst b/doc/usage/cmd/part.rst
index b91f6541f7f..a0e7be08a9a 100644
--- a/doc/usage/cmd/part.rst
+++ b/doc/usage/cmd/part.rst
@@ -52,7 +52,7 @@ The 'part list' command prints or sets an environment variable to the list of pa
         an optional environment variable to store the list of partitions value into.
 
 The 'part start' command sets an environment variable to the start of the partition (in blocks),
-part can be either partition number or partition name.
+part can be either partition number, partition UUID or partition name.
 
     interface
         interface for accessing the block device (mmc, sata, scsi, usb, ....)
@@ -64,7 +64,7 @@ part can be either partition number or partition name.
         a variable to store the current start of the partition value into.
 
 The 'part size' command sets an environment variable to the size of the partition (in blocks),
-part can be either partition number or partition name.
+part can be either partition number, partition UUID or partition name.
 
     interface
         interface for accessing the block device (mmc, sata, scsi, usb, ....)
@@ -76,7 +76,7 @@ part can be either partition number or partition name.
         a variable to store the current size of the partition value into.
 
 The 'part number' command sets an environment variable to the partition number using the partition name,
-part must be specified as partition name.
+part must be specified as partition UUID or partition name.
 
     interface
         interface for accessing the block device (mmc, sata, scsi, usb, ....)
diff --git a/doc/usage/cmd/reset.rst b/doc/usage/cmd/reset.rst
index 366b17eea16..79bc8b9deca 100644
--- a/doc/usage/cmd/reset.rst
+++ b/doc/usage/cmd/reset.rst
@@ -11,7 +11,9 @@ Synopsis
 
 ::
 
-    reset [-w]
+    reset
+    reset -w
+    reset -edl
 
 Description
 -----------
@@ -20,10 +22,14 @@ Perform reset of the CPU. By default does COLD reset, which resets CPU,
 DDR and peripherals, on some boards also resets external PMIC.
 
 -w
-    Do warm WARM, reset CPU but keep peripheral/DDR/PMIC active.
+    Do WARM reset: reset CPU but keep peripheral/DDR/PMIC active.
+
+All other options require CONFIG_SYSRESET_CMD_RESET_ARGS=y.
 
 -edl
-    Boot to Emergency DownLoad mode on supported Qualcomm platforms.
+    Boot to Emergency DownLoad mode on supported Qualcomm platforms. Unsupported
+    platforms will print an error message but the command will successfully
+    return (having done nothing). Requires CONFIG_SYSRESET_QCOM_PSCI=y.
 
 Return value
 ------------