commit 68247112de045bd3a9986cb7e428ef6b9848326d
author Xinyu Zhang <xinyu.zhang@arm.com> Fri Jul 23 15:01:53 2021 +0800
committer David Hu <david.hu@arm.com> Fri Jul 23 10:14:39 2021 +0200
tree a1f8f26b3d5386b25818658db11bf0376c054ec6
parent bfa38ac4934b72798cee30ef0d742e6aea0fb61d

CppCheck: Apply TF-M patches to dependency repos

TF-M needs to apply extra patches to dependency repos for build.

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I72cc18deda93026b5fbc218aa632407cad9d0c35

run-cppcheck.sh

diff --git a/run-cppcheck.sh b/run-cppcheck.sh
index 9ed3521..564f6f0 100755
--- a/run-cppcheck.sh
+++ b/run-cppcheck.sh
@@ -72,10 +72,26 @@
 #Library file for cppcheck
 library_file="$(fix_win_path $(get_full_path $mypath))/cppcheck/arm-cortex-m.cfg"
 suppress_file="$(fix_win_path $(get_full_path $mypath))/cppcheck/tfm-suppress-list.txt"
-toolchain_file="$(fix_win_path $(get_full_path ./))/toolchain_GNUARM.cmake"
-test_repo="$(fix_win_path $(get_full_path ./))/../tf-m-tests"
-mbedtls_repo="$(fix_win_path $(get_full_path ./))/../mbedtls"
-mcuboot_repo="$(fix_win_path $(get_full_path ./))/../mcuboot"
+tfm_repo="$(fix_win_path $(get_full_path ./))"
+toolchain_file="$tfm_repo/toolchain_GNUARM.cmake"
+test_repo="$tfm_repo/../tf-m-tests"
+mbedtls_repo="$tfm_repo/../mbedtls"
+mcuboot_repo="$tfm_repo/../mcuboot"
+
+#Apply TF-M patches to dependency repos
+cnt=$(ls $tfm_repo/lib/ext/mcuboot/*.patch 2> /dev/null | wc -l)
+if [ "$cnt" != "0" ] ; then
+  cd $mcuboot_repo
+  git apply $tfm_repo/lib/ext/mcuboot/*.patch
+  cd -
+fi
+
+cnt=$(ls $tfm_repo/lib/ext/mbedcrypto/*.patch 2> /dev/null | wc -l)
+if [ "$cnt" != "0" ] ; then
+  cd $mbedtls_repo
+  git apply $tfm_repo/lib/ext/mbedcrypto/*.patch
+  cd -
+fi
 
 #Cmake compile params
 cmake_params="-DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DTFM_PLATFORM=arm/mps2/an521 -DTFM_TOOLCHAIN_FILE=$toolchain_file"