Merge tag 'efi-2026-01-rc5' of https://source.denx.de/u-boot/custodians/u-boot-efi

Pull request efi-2026-01-rc5

CI: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/28738

Documentation:

* Fix typos in the TI K3 board documentation.
* Describe the TI J742S2.

UEFI:

* Add EFI_PARTITION_INFO_PROTOCOL_GUID translation in the UUID library.

3 files changed, 28 insertions, 5 deletions

diff --git a/doc/board/ti/j784s4_evm.rst b/doc/board/ti/j784s4_evm.rst
index 22442874110..d858dc7cdbb 100644
--- a/doc/board/ti/j784s4_evm.rst
+++ b/doc/board/ti/j784s4_evm.rst
@@ -1,8 +1,8 @@
 .. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause
 .. sectionauthor:: Apurva Nandan <[email protected]>
 
-J784S4 and AM69 Platforms
-=========================
+J742S2, J784S4 and AM69 Platforms
+=================================
 
 Introduction
 ------------
@@ -37,6 +37,11 @@ Platform information:
 * https://www.ti.com/tool/J784S4XEVM
 * https://www.ti.com/tool/SK-AM69
 
+J742S2 is derivative of J784S24 SOC, More info can be found in
+
+* TRM : https://www.ti.com/lit/ug/spruje3/spruje3.pdf
+* Platform Information : https://www.ti.com/tool/J742S2XH01EVM
+
 Boot Flow
 ---------
 Below is the pictorial representation of boot flow:
@@ -99,6 +104,13 @@ Set the variables corresponding to this platform:
       export UBOOT_CFG_CORTEXR=am69_sk_r5_defconfig
       export UBOOT_CFG_CORTEXA=am69_sk_a72_defconfig
 
+   For J742S2-EVM, use the following U_BOOT_CFG instead:
+
+   .. prompt:: bash
+
+      export UBOOT_CFG_CORTEXR=j742s2_evm_r5_defconfig
+      export UBOOT_CFG_CORTEXA=j742s2_evm_a72_defconfig
+
 .. j784s4_evm_rst_include_start_build_steps
 
 1. Trusted Firmware-A
@@ -143,14 +155,21 @@ variant (GP, HS-FS, HS-SE) requires a different source for these files.
     * tiboot3-j784s4-gp-evm.bin from :ref:`step 3.1 <j784s4_evm_rst_u_boot_r5>`
     * tispl.bin_unsigned, u-boot.img_unsigned from :ref:`step 3.2 <j784s4_evm_rst_u_boot_a72>`
 
+  .. note::
+
+    For J742S2, GP variant is not available.
+
+
  - HS-FS
 
     * tiboot3-j784s4-hs-fs-evm.bin from :ref:`step 3.1 <j784s4_evm_rst_u_boot_r5>`
+    * tiboot3-j742s2-hs-fs-evm.bin from :ref:`step 3.1 <j784s4_evm_rst_u_boot_r5>`
     * tispl.bin, u-boot.img from :ref:`step 3.2 <j784s4_evm_rst_u_boot_a72>`
 
  - HS-SE
 
     * tiboot3-j784s4-hs-evm.bin from :ref:`step 3.1 <j784s4_evm_rst_u_boot_r5>`
+    * tiboot3-j742s2-hs-evm.bin from :ref:`step 3.1 <j784s4_evm_rst_u_boot_r5>`
     * tispl.bin, u-boot.img from :ref:`step 3.2 <j784s4_evm_rst_u_boot_a72>`
 
 Image formats
diff --git a/doc/board/ti/k3.rst b/doc/board/ti/k3.rst
index 37a66b3c69d..913cdd7d09e 100644
--- a/doc/board/ti/k3.rst
+++ b/doc/board/ti/k3.rst
@@ -653,9 +653,9 @@ Refer (:ref:`U-boot ARMV8 build <k3_rst_include_start_build_steps_uboot>`)
 Saving environment
 ------------------
 
-SAVEENV is disabled by default and for the new flow uses Uenv.txt as the default
-way for saving the environments. This has been done as Uenv.txt is more granular
-then the saveenv command and can be used across various bootmodes too.
+SAVEENV is disabled by default and for the new flow uses uEnv.txt as the default
+way for saving the environments. This has been done as uEnv.txt is more granular
+than the saveenv command and can be used across various bootmodes too.
 
 **Writing to MMC/EMMC**
 
diff --git a/lib/uuid.c b/lib/uuid.c
index e0f8d55438b..0a166320e07 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -140,6 +140,10 @@ static const struct {
 		EFI_DISK_IO_PROTOCOL_GUID,
 	},
 	{
+		NULL, "Partition Info",
+		EFI_PARTITION_INFO_PROTOCOL_GUID,
+	},
+	{
 		NULL, "Simple File System",
 		EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID,
 	},