diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdn2.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdn2.inc
index e020c5d8..898ce78d 100644
--- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdn2.inc
+++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdn2.inc
@@ -11,6 +11,7 @@ SRC_URI_EDK2_PLATFORMS = "git://gitlab.arm.com/infra-solutions/reference-design/
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI:append = " file://0001-Changes-in-acpica-20260408-are-now-causing-issues-wi.patch;patchdir=edk2-platforms"
+SRC_URI:remove = "file://0001-DynamicTablesPkg-fix-SmbiosType2Genertor-build-failu.patch"
 
 SRCBRANCH_edk2 = "refinfra"
 SRCBRANCH_edk2_platforms = "refinfra"
diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdv2.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdv2.inc
index 89126c5f..1eb56646 100644
--- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdv2.inc
+++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdv2.inc
@@ -11,6 +11,7 @@ SRC_URI_EDK2_PLATFORMS = "git://gitlab.arm.com/infra-solutions/reference-design/
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI:append = " file://0001-Changes-in-acpica-20260408-are-now-causing-issues-wi.patch;patchdir=edk2-platforms"
+SRC_URI:remove = "file://0001-DynamicTablesPkg-fix-SmbiosType2Genertor-build-failu.patch"
 
 SRCBRANCH_edk2 = "refinfra"
 SRCBRANCH_edk2_platforms = "refinfra"
diff --git a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202605.bb b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202608.bb
similarity index 95%
rename from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202605.bb
rename to meta-arm/recipes-bsp/uefi/edk2-basetools-native_202608.bb
index e10b85cb..78baf2ee 100644
--- a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202605.bb
+++ b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202608.bb
@@ -5,7 +5,7 @@
 # SRCREV_brotli must be kept in sync with the brotli submodule commit that
 # the pinned edk2 SRCREV declares in its .gitmodules. Update it whenever
 # the edk2 SRCREV is bumped.
-#   edk2-stable202602 (b7a715f7): brotli e230f474
+#   edk2-stable202608 (b7a715f7): brotli e230f474
 
 SUMMARY = "EDK2 Base Tools"
 LICENSE = "BSD-2-Clause-Patent"
@@ -17,7 +17,7 @@ SRC_URI = " \
 "
 LIC_FILES_CHKSUM = "file://License.txt;md5=2b415520383f7964e96700ae12b4570a"
 
-SRCREV = "b03a21a63e3bd001f52c527e5a57feddb53a690b"
+SRCREV = "2970e5699ba6267f3384ffab20f96647578aebc8"
 SRCREV_brotli = "e230f474b87134e8c6c85b630084c612057f253e"
 SRCREV_FORMAT = "default_brotli"
 
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware/0001-DynamicTablesPkg-fix-SmbiosType2Genertor-build-failu.patch b/meta-arm/recipes-bsp/uefi/edk2-firmware/0001-DynamicTablesPkg-fix-SmbiosType2Genertor-build-failu.patch
new file mode 100644
index 00000000..0352beac
--- /dev/null
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware/0001-DynamicTablesPkg-fix-SmbiosType2Genertor-build-failu.patch
@@ -0,0 +1,41 @@
+From 7d2f6b6e31fad2c96c6fc55c17e79f8c96b4bfcf Mon Sep 17 00:00:00 2001
+From: Yeoreum Yun <yeoreum.yun@arm.com>
+Date: Mon, 10 Aug 2026 15:40:06 +0100
+Subject: [PATCH] DynamicTablesPkg: fix SmbiosType2Genertor build failure with
+ clang
+
+BaseboardCount type is UINT32. Using MAX_UINTN in the comparision
+triggers below build error:
+
+  type 'UINT32' (aka 'unsigned int') is always false
+    [-Werror,-Wtautological-constant-out-of-range-compare]
+  199 |       (BaseboardCount > (MAX_UINTN / sizeof (*CmObjectList))))
+
+To address this, use MAX_UINT32 instead of MAX_UINTN.
+
+Signed-off-by: Yeoreum Yun <yeoreum.yun@arm.com>
+
+Upstream-Status: Backport [7d2f6b6e31fad2c96c6fc55c17e79f8c96b4bfcf]
+Signed-off-by: Jon Mason <jon.mason@arm.com>
+---
+ .../Library/Smbios/SmbiosType2Lib/SmbiosType2Generator.c      | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/DynamicTablesPkg/Library/Smbios/SmbiosType2Lib/SmbiosType2Generator.c b/DynamicTablesPkg/Library/Smbios/SmbiosType2Lib/SmbiosType2Generator.c
+index 1250ef8059e9..5345d2b6d233 100644
+--- a/DynamicTablesPkg/Library/Smbios/SmbiosType2Lib/SmbiosType2Generator.c
++++ b/DynamicTablesPkg/Library/Smbios/SmbiosType2Lib/SmbiosType2Generator.c
+@@ -195,8 +195,8 @@ BuildSmbiosType2TableEx (
+   }
+ 
+   if ((BaseboardInfo == NULL) ||
+-      (BaseboardCount > (MAX_UINTN / sizeof (*TableList))) ||
+-      (BaseboardCount > (MAX_UINTN / sizeof (*CmObjectList))))
++      (BaseboardCount > (MAX_UINT32 / sizeof (*TableList))) ||
++      (BaseboardCount > (MAX_UINT32 / sizeof (*CmObjectList))))
+   {
+     DEBUG ((DEBUG_ERROR, "%a: Invalid Baseboard object list\n", __func__));
+     return EFI_INVALID_PARAMETER;
+-- 
+2.39.5
+
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202605.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202605.bb
deleted file mode 100644
index 8f1afe13..00000000
--- a/meta-arm/recipes-bsp/uefi/edk2-firmware_202605.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require recipes-bsp/uefi/edk2-firmware.inc
-
-SRCREV_edk2           ?= "b03a21a63e3bd001f52c527e5a57feddb53a690b"
-SRCREV_edk2-platforms ?= "04470160f67192c53ec9192e0e8460d183fe49ec"
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202608.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202608.bb
new file mode 100644
index 00000000..5008fcca
--- /dev/null
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_202608.bb
@@ -0,0 +1,7 @@
+require recipes-bsp/uefi/edk2-firmware.inc
+
+SRCREV_edk2           ?= "2970e5699ba6267f3384ffab20f96647578aebc8"
+SRCREV_edk2-platforms ?= "c98cdf8de9bd84a3267623e64f4388e21de69512"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://0001-DynamicTablesPkg-fix-SmbiosType2Genertor-build-failu.patch"
diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb
index 1c4753cb..c9fdaa50 100644
--- a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb
+++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb
@@ -1,4 +1,4 @@
-require recipes-bsp/uefi/edk2-firmware_202605.bb
+require recipes-bsp/uefi/edk2-firmware_202608.bb
 PROVIDES:remove = "virtual/bootloader"
 
 LICENSE += "AND Apache-2.0"