diff --git a/linux-aarch64/trusted-firmware-a/LICENSE b/linux-aarch64/trusted-firmware-a-spmd/LICENSE
similarity index 88%
rename from linux-aarch64/trusted-firmware-a/LICENSE
rename to linux-aarch64/trusted-firmware-a-spmd/LICENSE
index 2f97043..80f1118 100644
--- a/linux-aarch64/trusted-firmware-a/LICENSE
+++ b/linux-aarch64/trusted-firmware-a-spmd/LICENSE
@@ -76,5 +76,15 @@
    BSD-3-Clause license. Any contributions to this code must be made under the
    terms of both licenses.
 
+-  Some source files originating from the Linux source tree, which are
+   disjunctively dual licensed (GPL-2.0 OR MIT), are redistributed under the
+   terms of the MIT license. These files are:
+
+   -  ``include/dt-bindings/interrupt-controller/arm-gic.h``
+   -  ``include/dt-bindings/interrupt-controller/irq.h``
+
+   See the original `Linux MIT license`_.
+
 .. _FreeBSD: http://www.freebsd.org
+.. _Linux MIT license: https://raw.githubusercontent.com/torvalds/linux/master/LICENSES/preferred/MIT
 .. _SCC: http://www.simple-cc.org/
diff --git a/linux-aarch64/trusted-firmware-a/METADATA b/linux-aarch64/trusted-firmware-a-spmd/METADATA
similarity index 71%
rename from linux-aarch64/trusted-firmware-a/METADATA
rename to linux-aarch64/trusted-firmware-a-spmd/METADATA
index 17af364..b032f1b 100644
--- a/linux-aarch64/trusted-firmware-a/METADATA
+++ b/linux-aarch64/trusted-firmware-a-spmd/METADATA
@@ -4,13 +4,13 @@
 third_party {
   url {
     type: HOMEPAGE
-    value: "https://www.trustedfirmware.org/"
+    value: "https://www.trustedfirmware.org/projects/tf-a"
   }
   url {
     type: GIT
     value: "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git"
   }
-  version: "2.6"
-  last_upgrade_date { year: 2022 month: 04 day: 20 }
+  version: "2.8"
+  last_upgrade_date { year: 2023 month: 01 day: 17 }
   license_type: NOTICE
 }
diff --git a/linux-aarch64/trusted-firmware-a-spmd/README.md b/linux-aarch64/trusted-firmware-a-spmd/README.md
new file mode 100644
index 0000000..a517060
--- /dev/null
+++ b/linux-aarch64/trusted-firmware-a-spmd/README.md
@@ -0,0 +1,10 @@
+# Trusted Firmware-A
+
+TF-A is built with command line options to include the SPMD (FF-A Secure Partition Manager Dispatcher) into the BL31 image.
+Additional options are provided to support Hafnium/SPMC running at S-EL2.
+PIE and RESET_TO_BL31 options are used as test configurations don't assume BL1/BL2 bootloaders usage.
+
+```
+$ make CROSS_COMPILE=aarch64-none-elf- SPD=spmd CTX_INCLUDE_MTE_REGS=1 CTX_INCLUDE_EL2_REGS=1 ARM_ARCH_MINOR=5 BRANCH_PROTECTION=1 CTX_INCLUDE_PAUTH_REGS=1 PLAT=fvp SP_LAYOUT_FILE=dummy RESET_TO_BL31=1 ARM_LINUX_KERNEL_AS_BL33=1 PRELOADED_BL33_BASE=0x88000000 ARM_PRELOADED_DTB_BASE=0x82000000 GIC_EXT_INTID=1 -j8
+$ cp build/fvp/release/bl31.bin ../hafnium/prebuilts/linux-aarch64/trusted-firmware-a-spmd/fvp/bl31.bin
+```
diff --git a/linux-aarch64/trusted-firmware-a-spmd/fvp/bl31.bin b/linux-aarch64/trusted-firmware-a-spmd/fvp/bl31.bin
new file mode 100755
index 0000000..c8040eb
--- /dev/null
+++ b/linux-aarch64/trusted-firmware-a-spmd/fvp/bl31.bin
Binary files differ
diff --git a/linux-aarch64/trusted-firmware-a/README.md b/linux-aarch64/trusted-firmware-a/README.md
deleted file mode 100644
index 22d2fc5..0000000
--- a/linux-aarch64/trusted-firmware-a/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# FF-A Secure Partition Manager (SPMD/BL31)
-
-We also use trusted-firmware-a from [TrustedFirmware.org](https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/), because we depend on SPMD implementation to run Hafnium as SPMC.
-
-trusted-firmware-a was built, to generate 'bl31_spmd.bin', with the following commands:
-
-```
-$ make CROSS_COMPILE=aarch64-none-elf- SPD=spmd CTX_INCLUDE_MTE_REGS=1 CTX_INCLUDE_EL2_REGS=1 ARM_ARCH_MINOR=5 BRANCH_PROTECTION=1 CTX_INCLUDE_PAUTH_REGS=1 PLAT=fvp SP_LAYOUT_FILE=dummy RESET_TO_BL31=1 ARM_LINUX_KERNEL_AS_BL33=1 PRELOADED_BL33_BASE=0x88000000 ARM_PRELOADED_DTB_BASE=0x82000000 GIC_EXT_INTID=1 -j8
-$ cp build/fvp/release/bl31.bin ../hafnium/prebuilts/linux-aarch64/trusted-firmware-a/fvp/bl31_spmd.bin
-```
diff --git a/linux-aarch64/trusted-firmware-a/fvp/bl31_spmd.bin b/linux-aarch64/trusted-firmware-a/fvp/bl31_spmd.bin
deleted file mode 100755
index 3dd78ef..0000000
--- a/linux-aarch64/trusted-firmware-a/fvp/bl31_spmd.bin
+++ /dev/null
Binary files differ