diff --git a/WHENCE b/WHENCE
index 69b16c7cddd9f2af31cc4aab88e6212600d4f395..c5fd679e4329b5a243603517d9661dc0f1b0d360 100644
--- a/WHENCE
+++ b/WHENCE
@@ -5266,7 +5266,7 @@ File: ti-sysfw/ti-sci-firmware-am64x_sr2-hs-cert.bin
 File: ti-sysfw/ti-sci-firmware-am64x_sr2-hs-enc.bin
 File: ti-sysfw/ti-sci-firmware-am64x_sr2-hs-fs-cert.bin
 File: ti-sysfw/ti-sci-firmware-am64x_sr2-hs-fs-enc.bin
-Version: v08.04.06
+Version: v08.04.07
 
 File: ti-sysfw/ti-sci-firmware-am65x-gp.bin
 File: ti-sysfw/ti-sci-firmware-am65x-hs-cert.bin
@@ -5278,7 +5278,7 @@ Version: v2022.01
 
 File: ti-sysfw/ti-fs-firmware-am62x-gp.bin
 File: ti-sysfw/ti-fs-stub-firmware-am62x-gp-signed.bin
-Version: v08.04.06
+Version: v08.04.07
 
 Licence: Redistributable. See LICENSE.ti for details.
 
diff --git a/ti-sysfw/ti-fs-firmware-am62x-gp.bin b/ti-sysfw/ti-fs-firmware-am62x-gp.bin
index 7c0dbd1d68b6e980e38688af03197c6efe22d66e..b7ad9ed2c1ea546771e9dbdc43b92de5042bd014 100644
Binary files a/ti-sysfw/ti-fs-firmware-am62x-gp.bin and b/ti-sysfw/ti-fs-firmware-am62x-gp.bin differ
diff --git a/ti-sysfw/ti-fs-stub-firmware-am62x-gp-signed.bin b/ti-sysfw/ti-fs-stub-firmware-am62x-gp-signed.bin
index e21bfe291c243ac33c7a247df39f26117a589159..3fd099515ae8a942e30a9d9b900c83bfd9b7b805 100644
Binary files a/ti-sysfw/ti-fs-stub-firmware-am62x-gp-signed.bin and b/ti-sysfw/ti-fs-stub-firmware-am62x-gp-signed.bin differ
diff --git a/ti-sysfw/ti-sci-firmware-am64x-gp.bin b/ti-sysfw/ti-sci-firmware-am64x-gp.bin
index 67b8b43fd78fb7c89c6526033b975cb44ada7615..220a2d2bf4968716b8398324bcff8da1cd8a21ff 100644
Binary files a/ti-sysfw/ti-sci-firmware-am64x-gp.bin and b/ti-sysfw/ti-sci-firmware-am64x-gp.bin differ
diff --git a/ti-sysfw/ti-sci-firmware-am64x-hs-cert.bin b/ti-sysfw/ti-sci-firmware-am64x-hs-cert.bin
index 31c41b340924d771dfc4ece7fe99a9f082bba67c..f20aaa44f0e44782ca227d24db0e429d1ac26f1d 100644
Binary files a/ti-sysfw/ti-sci-firmware-am64x-hs-cert.bin and b/ti-sysfw/ti-sci-firmware-am64x-hs-cert.bin differ
diff --git a/ti-sysfw/ti-sci-firmware-am64x-hs-enc.bin b/ti-sysfw/ti-sci-firmware-am64x-hs-enc.bin
index 1ced3695866db50217152d8a5edd71a06298dec7..e0f7c0563db5684a59cb2c9c1a125d5181b06273 100644
Binary files a/ti-sysfw/ti-sci-firmware-am64x-hs-enc.bin and b/ti-sysfw/ti-sci-firmware-am64x-hs-enc.bin differ
diff --git a/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-cert.bin b/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-cert.bin
index bedba5ea5418ac9dcd5c837934220efbb1d213a1..266d58497eb8d8b28f82662c555e522f999d39cd 100644
Binary files a/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-cert.bin and b/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-cert.bin differ
diff --git a/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-enc.bin b/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-enc.bin
index b8e740ce5cb6256a0ac5a2c9c0202916e40055dd..60ee94040c4bfd6ab13440528b53d8d9b67290e3 100644
Binary files a/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-enc.bin and b/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-enc.bin differ
diff --git a/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-fs-cert.bin b/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-fs-cert.bin
index 630f3fdca9e5b617e11f53e0c7a7b82aca2b9be0..0f1580d46ac88cdf8a070e2495242573ecebae40 100644
Binary files a/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-fs-cert.bin and b/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-fs-cert.bin differ
diff --git a/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-fs-enc.bin b/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-fs-enc.bin
index e100d33a5b5942e16889d982dab7c1e9f89bd9a5..69a094ad757a55bacaafd02b5ff723fd2c34ddb6 100644
Binary files a/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-fs-enc.bin and b/ti-sysfw/ti-sci-firmware-am64x_sr2-hs-fs-enc.bin differ