Merge tag 'efi-2026-10-rc4-2' of https://git.u-boot-project.org/u-boot/custodians/u-boot-efi

Pull request efi-2026-10-rc4-2

CI: https://git.u-boot-project.org/u-boot/custodians/u-boot-efi/-/pipelines/1198

Documentation:

* board: ti: am64x: add missing debugging section
* board: ti: correct path to tcl scripts
* regenerate u-boot-stats-v2026.07: Regenerate

UEFI

* Consider type of platform_get_rng_device() return value
* Remove duplicate function declarations

14 files changed, 60 insertions, 37 deletions

diff --git a/doc/board/ti/am6254atl_sk.rst b/doc/board/ti/am6254atl_sk.rst
index 18a3520b39c..0df058aee15 100644
--- a/doc/board/ti/am6254atl_sk.rst
+++ b/doc/board/ti/am6254atl_sk.rst
@@ -305,4 +305,4 @@ To start OpenOCD and connect to the board
 
 .. prompt:: bash $
 
-  openocd -f board/ti_am625evm.cfg
+   openocd -f board/ti/am625evm.cfg
diff --git a/doc/board/ti/am62ax_sk.rst b/doc/board/ti/am62ax_sk.rst
index 3453ed339e7..b04bfc991ea 100644
--- a/doc/board/ti/am62ax_sk.rst
+++ b/doc/board/ti/am62ax_sk.rst
@@ -435,4 +435,4 @@ To start OpenOCD and connect to the board
 
 .. prompt:: bash
 
-  openocd -f board/ti_am62a7evm.cfg
+   openocd -f board/ti/am62a7evm.cfg
diff --git a/doc/board/ti/am62dx_evm.rst b/doc/board/ti/am62dx_evm.rst
index 0d12e3ec147..88071b3e69d 100644
--- a/doc/board/ti/am62dx_evm.rst
+++ b/doc/board/ti/am62dx_evm.rst
@@ -237,10 +237,6 @@ detailed setup information.
 
 .. warning::
 
-  **AM62A**: OpenOCD support since August 2023 (git master)
-
-  **AM62D**: Uses AM62A configuration (compatible due to same core architecture)
-
   Until the next stable release of OpenOCD is available in your development
   environment's distribution, it might be necessary to build OpenOCD `from the
   source <https://github.com/openocd-org/openocd>`_.
@@ -253,4 +249,9 @@ To start OpenOCD and connect to the board
 
 .. prompt:: bash
 
-  openocd -f board/ti/am62a7evm.cfg
+   openocd -f board/ti/am62a7evm.cfg
+
+.. note::
+
+   The AM62D-EVM uses the same tcl configuration as the AM62A-SK due to
+   same core architecture.
diff --git a/doc/board/ti/am62px_sk.rst b/doc/board/ti/am62px_sk.rst
index 44dae4afc87..72de78d5f86 100644
--- a/doc/board/ti/am62px_sk.rst
+++ b/doc/board/ti/am62px_sk.rst
@@ -331,13 +331,11 @@ detailed setup information.
 
 .. warning::
 
-  **OpenOCD support after**: v0.12.0
+   **OpenOCD support after**: v0.12.0
 
-  While support for the entire K3 generation including the am62xxx
-  extended family was added before v0.12.0, the tcl scripts for the
-  am62px have been accepted and will be available in the next release of
-  OpenOCD. It may be necessary to build OpenOCD from source depending on
-  the version your distribution has packaged.
+   Until the next stable release of OpenOCD is available in your development
+   environment's distribution, it might be necessary to build OpenOCD `from the
+   source <https://github.com/openocd-org/openocd>`_.
 
 .. include::  k3.rst
     :start-after: .. k3_rst_include_start_openocd_connect_XDS110
@@ -347,4 +345,4 @@ To start OpenOCD and connect to the board
 
 .. prompt:: bash
 
-  openocd -f board/ti_am62pevm.cfg
+   openocd -f board/ti/am62pevm.cfg
diff --git a/doc/board/ti/am62x_sk.rst b/doc/board/ti/am62x_sk.rst
index ef9425035cb..2e4923f7a7a 100644
--- a/doc/board/ti/am62x_sk.rst
+++ b/doc/board/ti/am62x_sk.rst
@@ -867,4 +867,4 @@ To start OpenOCD and connect to the board
 
 .. prompt:: bash $
 
-  openocd -f board/ti_am625evm.cfg
+   openocd -f board/ti/am625evm.cfg
diff --git a/doc/board/ti/am64x_evm.rst b/doc/board/ti/am64x_evm.rst
index 65c4c456528..2e7d8f0549b 100644
--- a/doc/board/ti/am64x_evm.rst
+++ b/doc/board/ti/am64x_evm.rst
@@ -227,3 +227,27 @@ https://www.ti.com/lit/pdf/spruim2 under the `Boot Mode Pins` section.
 
   For SW2 and SW3, the switch state in the "ON" position = 1.
   Boot bits on SK is reversed bits to the bootmode signals
+
+Debugging U-Boot
+----------------
+
+See :ref:`Common Debugging environment - OpenOCD<k3_rst_refer_openocd>`: for
+detailed setup information.
+
+.. warning::
+
+   **OpenOCD support after**: v0.12.0
+
+   Until the next stable release of OpenOCD is available in your development
+   environment's distribution, it might be necessary to build OpenOCD `from the
+   source <https://github.com/openocd-org/openocd>`_.
+
+.. include::  k3.rst
+    :start-after: .. k3_rst_include_start_openocd_connect_XDS110
+    :end-before: .. k3_rst_include_end_openocd_connect_XDS110
+
+To start OpenOCD and connect to the board
+
+.. prompt:: bash
+
+   openocd -f board/ti/am642evm.cfg
diff --git a/doc/board/ti/am65x_evm.rst b/doc/board/ti/am65x_evm.rst
index 73ceef2e531..5f75c01ec65 100644
--- a/doc/board/ti/am65x_evm.rst
+++ b/doc/board/ti/am65x_evm.rst
@@ -321,4 +321,4 @@ To start OpenOCD and connect to the board
 
 .. prompt:: bash $
 
-  openocd -f board/ti_am654evm.cfg
+   openocd -f board/ti/am654evm.cfg
diff --git a/doc/board/ti/j7200_evm.rst b/doc/board/ti/j7200_evm.rst
index 4fd2aff8354..e5c29c2bbb7 100644
--- a/doc/board/ti/j7200_evm.rst
+++ b/doc/board/ti/j7200_evm.rst
@@ -232,4 +232,4 @@ To start OpenOCD and connect to the board
 
 .. prompt:: bash $
 
-  openocd -f board/ti_j7200evm.cfg
+   openocd -f board/ti/j7200evm.cfg
diff --git a/doc/board/ti/j721e_evm.rst b/doc/board/ti/j721e_evm.rst
index 41c8d4c72a8..c3f3736e625 100644
--- a/doc/board/ti/j721e_evm.rst
+++ b/doc/board/ti/j721e_evm.rst
@@ -261,4 +261,4 @@ To start OpenOCD and connect to the board
 
 .. prompt:: bash $
 
-  openocd -f board/ti_j721eevm.cfg
+   openocd -f board/ti/j721evm.cfg
diff --git a/doc/board/ti/j722s_evm.rst b/doc/board/ti/j722s_evm.rst
index 4b5cf027594..3d11271613c 100644
--- a/doc/board/ti/j722s_evm.rst
+++ b/doc/board/ti/j722s_evm.rst
@@ -255,4 +255,4 @@ To start OpenOCD and connect to the board
 
 .. prompt:: bash
 
-  openocd -f board/ti_j722sevm.cfg
+   openocd -f board/ti/j722sevm.cfg
diff --git a/doc/board/ti/j784s4_evm.rst b/doc/board/ti/j784s4_evm.rst
index ec82228ab90..54b4b6031f0 100644
--- a/doc/board/ti/j784s4_evm.rst
+++ b/doc/board/ti/j784s4_evm.rst
@@ -663,4 +663,4 @@ following.
 
 .. prompt:: bash
 
-  openocd -f board/ti_j784s4evm.cfg
+   openocd -f board/ti/j784s4evm.cfg
diff --git a/doc/develop/statistics/u-boot-stats-v2026.07.rst b/doc/develop/statistics/u-boot-stats-v2026.07.rst
index 724419a444a..9956b11adfa 100644
--- a/doc/develop/statistics/u-boot-stats-v2026.07.rst
+++ b/doc/develop/statistics/u-boot-stats-v2026.07.rst
@@ -5,7 +5,7 @@ Release Statistics for U-Boot v2026.07
 
 * Processed 1328 changesets from 212 developers
 
-* 25 employers found
+* 27 employers found
 
 * A total of 255173 lines added, 91237 removed (delta 163936)
 
@@ -763,7 +763,7 @@ Release Statistics for U-Boot v2026.07
    ====================================  =====
    Name                                  Count
    ====================================  =====
-   (Unknown)                             506 (38.1%)
+   (Unknown)                             446 (33.6%)
    BayLibre SAS                          179 (13.5%)
    Canonical                             98 (7.4%)
    Konsulko Group                        96 (7.2%)
@@ -771,8 +771,10 @@ Release Statistics for U-Boot v2026.07
    Renesas Electronics                   64 (4.8%)
    Texas Instruments                     60 (4.5%)
    AMD                                   48 (3.6%)
+   Qualcomm                              34 (2.6%)
    Toradex                               32 (2.4%)
    Bootlin                               27 (2.0%)
+   MediaTek Inc.                         26 (2.0%)
    Linaro                                23 (1.7%)
    Amarula Solutions                     19 (1.4%)
    ARM                                   16 (1.2%)
@@ -798,14 +800,16 @@ Release Statistics for U-Boot v2026.07
    Name                                  Count
    ====================================  =====
    Konsulko Group                        147099 (48.3%)
-   (Unknown)                             52846 (17.4%)
+   (Unknown)                             41196 (13.5%)
    Texas Instruments                     23592 (7.8%)
    Renesas Electronics                   19393 (6.4%)
    Canonical                             18957 (6.2%)
    BayLibre SAS                          13246 (4.4%)
    NXP                                   10795 (3.5%)
+   MediaTek Inc.                         9467 (3.1%)
    Toradex                               6609 (2.2%)
    Rockchip                              2606 (0.9%)
+   Qualcomm                              2183 (0.7%)
    Bootlin                               2149 (0.7%)
    Linaro                                2037 (0.7%)
    SUSE                                  1589 (0.5%)
@@ -833,13 +837,15 @@ Release Statistics for U-Boot v2026.07
    ====================================  =====
    NXP                                   71 (22.1%)
    Linaro                                69 (21.5%)
-   (Unknown)                             62 (19.3%)
+   (Unknown)                             50 (15.6%)
    BayLibre SAS                          47 (14.6%)
    AMD                                   29 (9.0%)
    Texas Instruments                     20 (6.2%)
+   MediaTek Inc.                         9 (2.8%)
    Konsulko Group                        4 (1.2%)
    ARM                                   4 (1.2%)
    Renesas Electronics                   3 (0.9%)
+   Qualcomm                              3 (0.9%)
    Siemens                               3 (0.9%)
    Canonical                             2 (0.6%)
    Toradex                               2 (0.6%)
@@ -856,9 +862,11 @@ Release Statistics for U-Boot v2026.07
    ====================================  =====
    Name                                  Count
    ====================================  =====
-   (Unknown)                             134 (62.9%)
+   (Unknown)                             117 (54.9%)
    Texas Instruments                     15 (7.0%)
+   MediaTek Inc.                         10 (4.7%)
    NXP                                   7 (3.3%)
+   Qualcomm                              7 (3.3%)
    Linaro                                5 (2.3%)
    Siemens                               5 (2.3%)
    Toradex                               5 (2.3%)
diff --git a/include/efi_loader.h b/include/efi_loader.h
index 3a4d502631c..ef25124fd84 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -1026,11 +1026,6 @@ struct efi_load_option {
 	const u8 *optional_data;
 };
 
-struct efi_device_path *efi_dp_from_lo(struct efi_load_option *lo,
-				       const efi_guid_t *guid);
-struct efi_device_path *efi_dp_concat(const struct efi_device_path *dp1,
-				      const struct efi_device_path *dp2,
-				      size_t split_end_node);
 struct efi_device_path *search_gpt_dp_node(struct efi_device_path *device_path);
 efi_status_t efi_deserialize_load_option(struct efi_load_option *lo, u8 *data,
 					 efi_uintn_t *size);
diff --git a/lib/efi_loader/efi_rng.c b/lib/efi_loader/efi_rng.c
index 7810b4e47ea..3a831e2232b 100644
--- a/lib/efi_loader/efi_rng.c
+++ b/lib/efi_loader/efi_rng.c
@@ -30,10 +30,8 @@ __weak efi_status_t platform_get_rng_device(struct udevice **dev)
 	struct udevice *devp;
 
 	ret = uclass_get_device(UCLASS_RNG, 0, &devp);
-	if (ret) {
-		debug("Unable to get rng device\n");
+	if (ret)
 		return EFI_DEVICE_ERROR;
-	}
 
 	*dev = devp;
 
@@ -105,7 +103,7 @@ static efi_status_t EFIAPI getrng(struct efi_rng_protocol *this,
 				  uint8_t *rng_value)
 {
 	int ret;
-	efi_status_t status = EFI_SUCCESS;
+	efi_status_t status;
 	struct udevice *dev;
 	const efi_guid_t rng_raw_guid = EFI_RNG_ALGORITHM_RAW;
 
@@ -125,10 +123,9 @@ static efi_status_t EFIAPI getrng(struct efi_rng_protocol *this,
 		}
 	}
 
-	ret = platform_get_rng_device(&dev);
-	if (ret != EFI_SUCCESS) {
+	status = platform_get_rng_device(&dev);
+	if (status != EFI_SUCCESS) {
 		EFI_PRINT("Rng device not found\n");
-		status = EFI_UNSUPPORTED;
 		goto back;
 	}