Merge remote-tracking branch 'origin/release/2.2.x'

Change-Id: I4583dfb16378c788fe9c0b1224d28e82c69df3d7
Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 8e332de..2e5898d 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -745,7 +745,7 @@
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug"],
                 "with_bl2":         [True],
-                "profile":          ["profile_medium_arotless"],
+                "profile":          ["profile_small", "profile_medium_arotless"],
                 "extra_params":     ["PSOFF"]
                 },
                 "common_params": _common_tfm_builder_cfg,
diff --git a/clone.sh b/clone.sh
index 6a8628b..0b4aa44 100755
--- a/clone.sh
+++ b/clone.sh
@@ -111,7 +111,7 @@
 T_COSE_NAME="t_cose"
 
 TFM_EXTRAS_PROJECT="${TFM_EXTRAS_URL:-}"
-TFM_EXTRAS_REFSPEC="${TFM_EXTRAS_REFSPEC:-"$(parse_version lib/ext/tf-m-extras/CMakeLists.txt set\(TFM_EXTRAS_REPO_VERSION \" 2)"}"
+TFM_EXTRAS_REFSPEC="${TFM_EXTRAS_REFSPEC:-"$(parse_version config/config_base.cmake set\(TFM_EXTRAS_REPO_VERSION \" 2)"}"
 TFM_EXTRAS_NAME="tf-m-extras"
 
 TFM_TOOLS_PROJECT="${TFM_TOOLS_URL:-}"