diff --git a/meta-arm-bsp/recipes-bsp/hafnium/hafnium-tc.inc b/meta-arm-bsp/recipes-bsp/hafnium/hafnium-tc.inc
index 4545c829..75707e1d 100644
--- a/meta-arm-bsp/recipes-bsp/hafnium/hafnium-tc.inc
+++ b/meta-arm-bsp/recipes-bsp/hafnium/hafnium-tc.inc
@@ -9,6 +9,8 @@ PV = "2.7+git${SRCPV}"
 
 FILESEXTRAPATHS:prepend:tc := "${THISDIR}/files/tc:"
 
+SRC_URI:remove = "file://0001-Fix-build-with-clang-15.patch"
+
 SRC_URI:append = " \
         file://0001-feat-emulate-cntp-timer-register-accesses-using-cnth.patch \
         file://0002-feat-emulate-interrupt-controller-register-access.patch \
diff --git a/meta-arm/recipes-bsp/hafnium/hafnium/0001-Fix-build-with-clang-15.patch b/meta-arm/recipes-bsp/hafnium/hafnium/0001-Fix-build-with-clang-15.patch
index c376a9c6..f037d2b5 100644
--- a/meta-arm/recipes-bsp/hafnium/hafnium/0001-Fix-build-with-clang-15.patch
+++ b/meta-arm/recipes-bsp/hafnium/hafnium/0001-Fix-build-with-clang-15.patch
@@ -1,4 +1,4 @@
-From 1a84b72df8e749665733c3489f605264ccc63d73 Mon Sep 17 00:00:00 2001
+From d96f696244e0869654004f49586b53811037db30 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 22 Sep 2022 19:13:49 -0700
 Subject: [PATCH] Fix build with clang-15
@@ -8,15 +8,19 @@ Remove unused variable suites_in_image
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- test/hftest/common.c                                    | 2 --
- test/vmapi/arch/aarch64/gicv3/gicv3.c                   | 2 +-
- test/vmapi/arch/aarch64/gicv3/inc/gicv3.h               | 2 +-
- test/vmapi/arch/aarch64/gicv3/timer_secondary.c         | 2 +-
- test/vmapi/el0_partitions/services/interruptible.c      | 2 +-
- test/vmapi/el0_partitions/services/interruptible_echo.c | 2 +-
- 6 files changed, 5 insertions(+), 7 deletions(-)
 
+---
+ test/hftest/common.c                                         | 2 --
+ test/vmapi/arch/aarch64/gicv3/gicv3.c                        | 2 +-
+ test/vmapi/arch/aarch64/gicv3/inc/gicv3.h                    | 2 +-
+ test/vmapi/arch/aarch64/gicv3/timer_secondary.c              | 2 +-
+ test/vmapi/el0_partitions/services/interruptible.c           | 2 +-
+ test/vmapi/el0_partitions/services/interruptible_echo.c      | 2 +-
+ test/vmapi/primary_with_secondaries/services/interruptible.c | 2 +-
+ 7 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/test/hftest/common.c b/test/hftest/common.c
+index 344ff24..175230a 100644
 --- a/test/hftest/common.c
 +++ b/test/hftest/common.c
 @@ -67,7 +67,6 @@ void hftest_json(void)
@@ -35,6 +39,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  			suite = test->suite;
  			tests_in_suite = 0;
  			HFTEST_LOG("    {");
+diff --git a/test/vmapi/arch/aarch64/gicv3/gicv3.c b/test/vmapi/arch/aarch64/gicv3/gicv3.c
+index 682bc4e..82582f0 100644
 --- a/test/vmapi/arch/aarch64/gicv3/gicv3.c
 +++ b/test/vmapi/arch/aarch64/gicv3/gicv3.c
 @@ -42,7 +42,7 @@ static void irq(void)
@@ -46,6 +52,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  {
  	const uint32_t mode = MM_MODE_R | MM_MODE_W | MM_MODE_D;
  	hftest_mm_identity_map((void *)GICD_BASE, PAGE_SIZE, mode);
+diff --git a/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h b/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h
+index 5faf3a8..f681e58 100644
 --- a/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h
 +++ b/test/vmapi/arch/aarch64/gicv3/inc/gicv3.h
 @@ -30,4 +30,4 @@ extern void *recv_buffer;
@@ -54,6 +62,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  
 -void system_setup();
 +void system_setup(void);
+diff --git a/test/vmapi/arch/aarch64/gicv3/timer_secondary.c b/test/vmapi/arch/aarch64/gicv3/timer_secondary.c
+index ebc4db3..8260e10 100644
 --- a/test/vmapi/arch/aarch64/gicv3/timer_secondary.c
 +++ b/test/vmapi/arch/aarch64/gicv3/timer_secondary.c
 @@ -55,7 +55,7 @@ TEAR_DOWN(timer_secondary_ffa)
@@ -65,6 +75,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  {
  	const char message[] = "loop 0099999";
  	const char expected_response[] = "Got IRQ 03.";
+diff --git a/test/vmapi/el0_partitions/services/interruptible.c b/test/vmapi/el0_partitions/services/interruptible.c
+index 0d00b16..3c3250d 100644
 --- a/test/vmapi/el0_partitions/services/interruptible.c
 +++ b/test/vmapi/el0_partitions/services/interruptible.c
 @@ -43,7 +43,7 @@ static void irq(void)
@@ -76,6 +88,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  {
  	struct ffa_value received;
  
+diff --git a/test/vmapi/el0_partitions/services/interruptible_echo.c b/test/vmapi/el0_partitions/services/interruptible_echo.c
+index b618cf2..636ebc9 100644
 --- a/test/vmapi/el0_partitions/services/interruptible_echo.c
 +++ b/test/vmapi/el0_partitions/services/interruptible_echo.c
 @@ -32,7 +32,7 @@ static void irq(void)
@@ -87,6 +101,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  {
  	struct ffa_value received;
  
+diff --git a/test/vmapi/primary_with_secondaries/services/interruptible.c b/test/vmapi/primary_with_secondaries/services/interruptible.c
+index cc1c1f9..c94093b 100644
 --- a/test/vmapi/primary_with_secondaries/services/interruptible.c
 +++ b/test/vmapi/primary_with_secondaries/services/interruptible.c
 @@ -40,7 +40,7 @@ static void irq(void)