diff --git a/packages/tools/atf/package.mk b/packages/tools/atf/package.mk
index 942cdf7586..298795512d 100644
--- a/packages/tools/atf/package.mk
+++ b/packages/tools/atf/package.mk
@@ -16,9 +16,9 @@ PKG_TOOLCHAIN="manual"
 
 make_target() {
   if [ "${DEVICE}" = "iMX8" ]; then
-    CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" CFLAGS="--param=min-pagesize=0" make PLAT=${ATF_PLATFORM} bl31
+    CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="--no-warn-rwx-segments" CFLAGS="--param=min-pagesize=0" make PLAT=${ATF_PLATFORM} bl31
   else
-    CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" CFLAGS="" make PLAT=${ATF_PLATFORM} bl31
+    CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="--no-warn-rwx-segments" CFLAGS="" make PLAT=${ATF_PLATFORM} bl31
   fi
 }
 
diff --git a/packages/tools/crust/patches/fix-binutils-2-39.patch b/packages/tools/crust/patches/fix-binutils-2-39.patch
new file mode 100644
index 0000000000..310433c7a4
--- /dev/null
+++ b/packages/tools/crust/patches/fix-binutils-2-39.patch
@@ -0,0 +1,12 @@
+--- a/Makefile	2022-08-09 08:48:15.390323604 +0000
++++ b/Makefile	2022-08-09 08:49:45.623098723 +0000
+@@ -84,7 +84,8 @@
+ 		   -Wl,--fatal-warnings \
+ 		   -Wl,--gc-sections \
+ 		   -Wl,--no-dynamic-linker \
+-		   -Wl,--no-undefined
++		   -Wl,--no-undefined \
++		   -Wl,--no-warn-rwx-segments
+ 
+ ###############################################################################
+