aboutsummaryrefslogtreecommitdiff
path: root/docs/contributing
diff options
context:
space:
mode:
Diffstat (limited to 'docs/contributing')
-rw-r--r--docs/contributing/maintainers.rst91
1 files changed, 71 insertions, 20 deletions
diff --git a/docs/contributing/maintainers.rst b/docs/contributing/maintainers.rst
index 811035f291..546c42f155 100644
--- a/docs/contributing/maintainers.rst
+++ b/docs/contributing/maintainers.rst
@@ -1,15 +1,15 @@
-Maintainers
-===========
+Trusted Firmware-M (TF-M) is an open govcommunity project.
+All contributions are ultimately merged by the maintainers listed below.
+Technical ownership of most parts of the codebase falls on the code owners
+listed below. An acknowledgement from these code owners is required before
+the maintainers merge a contribution.
-Trusted Firmware M is a community maintained project. Contributions can only
-be approved and merged by the maintainers listed below.
-Sub-maintainers' approval is required for their specific areas of ownership.
+More details may be found in the `Project Maintenance Process
+<https://developer.trustedfirmware.org/w/collaboration/project-maintenance-process/>`_
+document.
-Contributions must follow the instructions in
-:doc:`Contributing Guidelines </docs/contributing/contributing>`.
-
-Main maintainers
-----------------
+Maintainers
+===========
Abhishek Pandit
:email: `abhishek.pandit@arm.com <abhishek.pandit@arm.com>`__
@@ -23,8 +23,13 @@ Miklos Balint
:email: `miklos.balint@arm.com <miklos.balint@arm.com>`__
:github: `wmnt <https://github.com/wmnt>`__
-Sub-maintainers
----------------
+Anton Komlev
+ :email: `Anton.Komlev@arm.com <Anton.Komlev@arm.com>`__
+ :github: `Anton-TF <https://github.com/Anton-TF>`__
+
+
+Code owners
+===========
Bootloader
~~~~~~~~~~
@@ -33,8 +38,8 @@ Tamas Ban
:email: `Tamas.Ban@arm.com <Tamas.Ban@arm.com>`__
:github: `tamban01 <https://github.com/tamban01>`__
-Secure Storage (ITS & PS)
-~~~~~~~~~~~~~~~~~~~~~~~~~
+Secure Storage
+~~~~~~~~~~~~~~
Jamie Fox
:email: `jamie.fox@arm.com <jamie.fox@arm.com>`__
@@ -52,18 +57,18 @@ SPM & IPC
Ken Liu
:email: `Ken.Liu@arm.com <Ken.Liu@arm.com>`__
- :github: `KenLSoft <https://github.com/KenLSoft>`__)
+ :github: `KenLSoft <https://github.com/KenLSoft>`__
Mate Toth-Pal
:email: `Mate.Toth-Pal@arm.com <Mate.Toth-Pal@arm.com>`__
- :github: `matetothpal <https://github.com/matetothpal>`__)
+ :github: `matetothpal <https://github.com/matetothpal>`__
Audit Log
~~~~~~~~~
-Anton Komlev
- :email: `Anton.Komlev <Anton.Komlev@arm.com>`__
- :github: `Anton-TF <https://github.com/Anton-TF>`__
+Jamie Fox
+ :email: `jamie.fox@arm.com <jamie.fox@arm.com>`__
+ :github: `jf549 <https://github.com/jf549>`__
Attestation
~~~~~~~~~~~
@@ -72,6 +77,52 @@ Tamas Ban
:email: `Tamas.Ban@arm.com <Tamas.Ban@arm.com>`__
:github: `tamban01 <https://github.com/tamban01>`__
---------------
+CMake Build System
+~~~~~~~~~~~~~~~~~~
+
+Anton Komlev
+ :email: `Anton.Komlev@arm.com <Anton.Komlev@arm.com>`__
+ :github: `Anton-TF <https://github.com/Anton-TF>`__
+
+
+Arm Platforms: MPS2, MPS3, Musca(A,B1,S1)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Mark Horvath
+ :email: `Mark.Horvath@arm.com <mark.horvath@arm.com>`__
+ :github: `mark-horvath-arm <https://github.com/mark-horvath-arm>`__
+
+Lakshmi Kailasanathan
+ :email: `Lakshmi.Kailasanathan@arm.com <lakshmi.kailasanathan@arm.com>`__
+ :github: `lakkai <https://github.com/lakkai>`__
+
+NXP Platforms
+~~~~~~~~~~~~~
+
+Andrej Butok
+ :email: `Andrej.Butok@nxp.com <andrey.butok@nxp.com>`__
+ :github: `AndreyButokNXP <https://github.com/AndreyButokNXP>`__
+
+STM Platforms: DISCO_L562QE, NUCLEO_L552ZE_Q
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Michel JAOUEN
+ :email: `Michel.Jaouen@st.com <michel.jaouen@st.com>`__
+ :github: `jamike <https://github.com/jamike>`__
+
+
+Cypress Platform:
+~~~~~~~~~~~~~~~~~
+
+Chris Brand
+ :email: `Chris Brand@cypress.com <chris.brand@cypress.com>`__
+ :github: `UEWBot <https://github.com/UEWBot>`__
+
+Raymond Ngun
+ :email: `Raymond.Ngunn@cypress.com <raymond.ngunn@cypress.com>`__
+ :github: `RaymondNgun <https://github.com/RaymondNgun>`__
+
+
+=============
*Copyright (c) 2017-2020, Arm Limited. All rights reserved.*