[2/2] HACKING: Official fix for tfm issue

diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/files/0001-Build-Fix-GNU-specs-command-line-argument-prefix.patch b/meta-arm/recipes-bsp/trusted-firmware-m/files/0001-Build-Fix-GNU-specs-command-line-argument-prefix.patch
new file mode 100644
index 00000000..b05401a0
--- /dev/null
+++ b/meta-arm/recipes-bsp/trusted-firmware-m/files/0001-Build-Fix-GNU-specs-command-line-argument-prefix.patch
@@ -0,0 +1,46 @@ 
+From f18f8e5fc28a0835c7316a4753dbf87cf11bbc8e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?D=C3=A1vid=20H=C3=A1zi?= <david.hazi@arm.com>
+Date: Thu, 2 Feb 2023 08:17:42 +0100
+Subject: [PATCH] Build: Fix GNU "specs" command line argument prefix
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GNU 12.2.Rel1 only parse this argument with one "-".
+Every ARM GNU manuals contains "-specs" instead of "--specs".
+
+Signed-off-by: Dávid Házi <david.hazi@arm.com>
+Change-Id: I206930d65ac0f7d47fb693e9ec8dc8cbc884dffc
+---
+ toolchain_GNUARM.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/toolchain_GNUARM.cmake b/toolchain_GNUARM.cmake
+index 7978eaca6891..0a36a4316f1d 100644
+--- a/toolchain_GNUARM.cmake
++++ b/toolchain_GNUARM.cmake
+@@ -1,5 +1,5 @@
+ #-------------------------------------------------------------------------------
+-# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
++# Copyright (c) 2020-2023, Arm Limited. All rights reserved.
+ #
+ # SPDX-License-Identifier: BSD-3-Clause
+ #
+@@ -35,7 +35,7 @@ macro(tfm_toolchain_reset_compiler_flags)
+     endif()
+ 
+     add_compile_options(
+-        --specs=nano.specs
++        -specs=nano.specs
+         -Wall
+         -Wno-format
+         -Wno-return-type
+@@ -64,7 +64,7 @@ macro(tfm_toolchain_reset_linker_flags)
+ 
+     add_link_options(
+         --entry=Reset_Handler
+-        --specs=nano.specs
++        -specs=nano.specs
+         LINKER:-check-sections
+         LINKER:-fatal-warnings
+         LINKER:--gc-sections
diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/files/0002-Build-Fix-lasted-ARM-GNU-linker-issue.patch b/meta-arm/recipes-bsp/trusted-firmware-m/files/0002-Build-Fix-lasted-ARM-GNU-linker-issue.patch
new file mode 100644
index 00000000..b9b6b8c9
--- /dev/null
+++ b/meta-arm/recipes-bsp/trusted-firmware-m/files/0002-Build-Fix-lasted-ARM-GNU-linker-issue.patch
@@ -0,0 +1,31 @@ 
+From 584e00ca61fd598008cdce780914eb6cfd502f51 Mon Sep 17 00:00:00 2001
+From: Summer Qin <summer.qin@arm.com>
+Date: Mon, 13 Mar 2023 15:35:56 +0800
+Subject: [PATCH] Build: Fix lasted ARM GNU linker issue
+
+Fix linker issue in 12.2.Rel1 Arm GNU Toolchain.
+
+Signed-off-by: Summer Qin <summer.qin@arm.com>
+Change-Id: I5e695255ef1d7d3b47880810b5bd3a41ec8b64bb
+---
+ toolchain_GNUARM.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/toolchain_GNUARM.cmake b/toolchain_GNUARM.cmake
+index 0a36a4316f1d..323d775c1c9a 100644
+--- a/toolchain_GNUARM.cmake
++++ b/toolchain_GNUARM.cmake
+@@ -64,11 +64,12 @@ macro(tfm_toolchain_reset_linker_flags)
+ 
+     add_link_options(
+         --entry=Reset_Handler
+-        -specs=nano.specs
++        -specs=rdimon.specs
+         LINKER:-check-sections
+         LINKER:-fatal-warnings
+         LINKER:--gc-sections
+         LINKER:--no-wchar-size-warning
++        LINKER:--no-warn-rwx-segments
+         ${MEMORY_USAGE_FLAG}
+     )
+ endmacro()
diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/files/rwx.patch b/meta-arm/recipes-bsp/trusted-firmware-m/files/rwx.patch
deleted file mode 100644
index b279cfea..00000000
--- a/meta-arm/recipes-bsp/trusted-firmware-m/files/rwx.patch
+++ /dev/null
@@ -1,24 +0,0 @@ 
-From 1d548c77d07fc9a83e3e9aa28a23aa19a0177e3b Mon Sep 17 00:00:00 2001
-From: Jon Mason <jon.mason@arm.com>
-Date: Wed, 18 Jan 2023 15:13:37 -0500
-Subject: [PATCH] arm/trusted-firmware-m: disable fatal warnings
-
-Signed-off-by: Jon Mason <jon.mason@arm.com>
-Upstream-Status: Inappropriate
-
----
- toolchain_GNUARM.cmake | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/toolchain_GNUARM.cmake b/toolchain_GNUARM.cmake
-index 7978eaca68..88395f922a 100644
---- a/toolchain_GNUARM.cmake
-+++ b/toolchain_GNUARM.cmake
-@@ -66,7 +66,6 @@ macro(tfm_toolchain_reset_linker_flags)
-         --entry=Reset_Handler
-         --specs=nano.specs
-         LINKER:-check-sections
--        LINKER:-fatal-warnings
-         LINKER:--gc-sections
-         LINKER:--no-wchar-size-warning
-         ${MEMORY_USAGE_FLAG}
diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc
index 9062df8c..e9b932e7 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc
+++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc
@@ -8,7 +8,10 @@  DESCRIPTION = "Trusted Firmware-M"
 HOMEPAGE = "https://git.trustedfirmware.org/trusted-firmware-m.git"
 PROVIDES = "virtual/trusted-firmware-m"
 
-SRC_URI += "file://rwx.patch"
+SRC_URI += " \
+    file://0001-Build-Fix-GNU-specs-command-line-argument-prefix.patch \
+    file://0002-Build-Fix-lasted-ARM-GNU-linker-issue.patch \
+    "
 
 UPSTREAM_CHECK_GITTAGREGEX = "^TF-Mv(?P<pver>\d+(\.\d+)+)$"