[2/2] arm-bsp/trusted-firmware-m: update libmetal and open-amp to 2023.04.0

diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/0001-cmake-modify-path-to-libmetal-version-file.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/0001-cmake-modify-path-to-libmetal-version-file.patch
index 68785f6c..d53524ad 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/0001-cmake-modify-path-to-libmetal-version-file.patch
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/0001-cmake-modify-path-to-libmetal-version-file.patch
@@ -1,6 +1,6 @@ 
-From dfdfd7f829f74b46f14470eae968c39b910fd11c Mon Sep 17 00:00:00 2001
+From 6b38b9990c4dab0cb8524506ef129d4f326f3800 Mon Sep 17 00:00:00 2001
 From: Jon Mason <jon.mason@arm.com>
-Date: Thu, 14 Dec 2023 09:01:02 -0500
+Date: Thu, 14 Dec 2023 09:23:09 -0500
 Subject: [PATCH] cmake: modify path to libmetal version file
 
 Commit ad87802d6e01e97946de20b6c2fa28aed184ed20 changed how the
@@ -16,12 +16,12 @@  Signed-off-by: Jon Mason <jon.mason@arm.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cmake/options.cmake b/cmake/options.cmake
-index 4b866164c390..004126a40da1 100644
+index a7b4ef8bdf03..a06009b6acc4 100644
 --- a/cmake/options.cmake
 +++ b/cmake/options.cmake
 @@ -1,4 +1,4 @@
--file(READ ${CMAKE_SOURCE_DIR}/VERSION ver)
-+file(READ ${CMAKE_SOURCE_DIR}/../libmetal/VERSION ver)
+-file(READ ${LIBMETAL_ROOT_DIR}/VERSION ver)
++file(READ ${LIBMETAL_ROOT_DIR}/../libmetal/VERSION ver)
  
  string(REGEX MATCH "VERSION_MAJOR = ([0-9]*)" _ ${ver})
  set(PROJECT_VERSION_MAJOR ${CMAKE_MATCH_1})
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc
index 8d91c523..f4623f50 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc
@@ -11,20 +11,20 @@  TFM_PLATFORM_IS_FVP ?= "FALSE"
 EXTRA_OECMAKE += "-DPLATFORM_IS_FVP=${TFM_PLATFORM_IS_FVP}"
 EXTRA_OECMAKE += "-DCC312_LEGACY_DRIVER_API_ENABLED=ON"
 
-# libmetal v2021.04.0
+# libmetal v2023.04.0
 LICENSE += "& BSD-3-Clause"
-LIC_FILES_CHKSUM += "file://../libmetal/LICENSE.md;md5=fe0b8a4beea8f0813b606d15a3df3d3c"
+LIC_FILES_CHKSUM += "file://../libmetal/LICENSE.md;md5=f4d5df0f12dcea1b1a0124219c0dbab4"
 SRC_URI += "git://github.com/OpenAMP/libmetal.git;protocol=https;branch=main;name=libmetal;destsuffix=git/libmetal \
             file://0001-cmake-modify-path-to-libmetal-version-file.patch;patchdir=../libmetal \
            "
-SRCREV_libmetal = "59e2f084d31a60a95c99ab130227674fd365764b"
+SRCREV_libmetal = "28fa2351d6a8121ce6c1c2ac5ee43ce08d38dbae"
 EXTRA_OECMAKE += "-DLIBMETAL_SRC_PATH=${S}/../libmetal -DLIBMETAL_BIN_PATH=${B}/libmetal-build"
 
-# OpenAMP v2021.04.0
+# OpenAMP v2023.04.0
 LICENSE += "& BSD-2-Clause & BSD-3-Clause"
-LIC_FILES_CHKSUM += "file://../openamp/LICENSE.md;md5=a8d8cf662ef6bf9936a1e1413585ecbf"
+LIC_FILES_CHKSUM += "file://../openamp/LICENSE.md;md5=ab88daf995c0bd0071c2e1e55f3d3505"
 SRC_URI += "git://github.com/OpenAMP/open-amp.git;protocol=https;branch=main;name=openamp;destsuffix=git/openamp"
-SRCREV_openamp = "c3f12991991d187d47637d88e8a66076f23d0c8c"
+SRCREV_openamp = "accac4d3610cbb268f3c3fe3c31dc45dd4c4dd17"
 EXTRA_OECMAKE += "-DLIBOPENAMP_SRC_PATH=${S}/../openamp -DLIBOPENAMP_BIN_PATH=${B}/libopenamp-build"