SPM: Merge 'ffm' and 'cmsis_psa' sources
The library model referenced CMSIS sources hence its adaptation
layer name was 'cmsis_func' - and then this style was applied to
the IPC model and brought in an IPC adaptation layer with the name
'cmsis_psa'. And folder 'ffm' contains the common logic.
Now the library model is deprecated so 'cmsis_psa' is the only
adaptation layer left. As far of now, there are no obvious
requirements about referencing the common logic or the adaptation
layer individually, so let's merge common logic and the adaptation
sources into one folder 'core', and keep the folders containing
extended functionalities (Non-secure clients identification e.g.)
at the same level as 'core' with a suffix 'ext' in the folder name.
Signed-off-by: Ken Liu <Ken.Liu@arm.com>
Change-Id: Ibfd753879c60aff9adbf400b9f35c9c66de86eb9
Co-authored-by: Xinyu Zhang <xinyu.zhang@arm.com>
diff --git a/docs/contributing/code_review_guide.rst b/docs/contributing/code_review_guide.rst
index 622bf75..0677b29 100644
--- a/docs/contributing/code_review_guide.rst
+++ b/docs/contributing/code_review_guide.rst
@@ -78,18 +78,14 @@
.. code-block:: c
- /* R3.1 FILE: s/spm/ffm/psa_client.c */
+ /* R3.1 FILE: s/spm/core/psa_client.c */
- /* R3.2 FILE: s/spm/cmsis_psa/tfm_secure_context.c */
+ /* R3.2 FILE: s/spm/core/tfm_secure_context.c */
- /* R3.3 FILE: s/spm/cmsis_psa/main.c */
-
- /* R3.4 FILE: s/spm/cmsis_psa/main.c, 'main' is a good entry name. */
- void main(void);
- /* R3.4 FILE: s/spm/ffm/spm.c, 'spm\_' as the namespace */
+ /* R3.4 FILE: s/spm/core/spm.c, 'spm\_' as the namespace */
void spm_init(void);
- /* R3.5 FILE: s/spm/ffm/main.c */
+ /* R3.5 FILE: s/spm/core/main.c */
static void init_functions(void);
/* R3.6 Not permitted: */
@@ -105,7 +101,7 @@
external MACRO wrapped assembler code is allowed. Here is one example of the
logic folder:
- - 'secure_fw/spm/ffm'.
+ - 'secure_fw/spm'.
Examples:
@@ -113,7 +109,7 @@
/*
* R4.1 The following MACRO is allowed to be referenced under
- * 'secure_fw/spm/ffm'
+ * 'secure_fw/spm'
*/
#define SVC(code) __asm volatile("svc %0", ::"I"(code))