diff --git a/3rdparty/arm-trusted-firmware b/3rdparty/arm-trusted-firmware
index 236c27d21f..3944adca59 160000
--- a/3rdparty/arm-trusted-firmware
+++ b/3rdparty/arm-trusted-firmware
@@ -1 +1 @@
-Subproject commit 236c27d21f52ad8f0a998e54774e3d8a4b59129d
+Subproject commit 3944adca5943a050ca7e7e9cc802a9ae04dec186
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index ad3941b099..92b26f5cd3 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -166,7 +166,7 @@ BL31_MAKEARGS += IS_ANYTHING_TO_BUILD=1
 # multi line string.
 BL31_MAKEARGS += BUILD_MESSAGE_TIMESTAMP='"$(shell grep "\#define COREBOOT_BUILD\>" $(obj)/build.h |cut -d\" -f2 \# \")"'
 
-BL31_CFLAGS := -fno-pic -fno-stack-protector -Wno-deprecated-declarations
+BL31_CFLAGS := -fno-pic -fno-stack-protector -Wno-deprecated-declarations -Wno-unused-function
 BL31_LDFLAGS := --emit-relocs
 
 BL31 := $(obj)/bl31.elf