blob: 5e490a967feb64aa9062f657d8c97c9b7050ca07 [file] [log] [blame]
Paul Beesleyfc9ee362019-03-07 15:47:15 +00001Contributor's Guide
2===================
Douglas Raillardd7c21b72017-06-28 15:23:03 +01003
4Getting Started
5---------------
6
Sandrine Bailleuxd3147342020-05-12 10:36:05 +02007- Make sure you have a Github account and you are logged on both
8 `developer.trustedfirmware.org`_ and `review.trustedfirmware.org`_.
Douglas Raillardd7c21b72017-06-28 15:23:03 +01009
Sandrine Bailleux6ef77ce2020-08-03 10:27:19 +020010- If you plan to contribute a major piece of work, it is usually a good idea to
11 start a discussion around it on the mailing list. This gives everyone
12 visibility of what is coming up, you might learn that somebody else is
13 already working on something similar or the community might be able to
14 provide some early input to help shaping the design of the feature.
15
16 If you intend to include Third Party IP in your contribution, please mention
17 it explicitly in the email thread and ensure that the changes that include
18 Third Party IP are made in a separate patch (or patch series).
Douglas Raillardd7c21b72017-06-28 15:23:03 +010019
Paul Beesleyd2fcc4e2019-05-29 13:59:40 +010020- Clone `Trusted Firmware-A`_ on your own machine as described in
21 :ref:`prerequisites_get_source`.
John Tsichritzis2fd3d922019-05-28 13:13:39 +010022- Create a local topic branch based on the `Trusted Firmware-A`_ ``master``
Douglas Raillardd7c21b72017-06-28 15:23:03 +010023 branch.
24
25Making Changes
26--------------
27
28- Make commits of logical units. See these general `Git guidelines`_ for
29 contributing to a project.
Paul Beesley07f0a312019-05-16 13:33:18 +010030- Follow the :ref:`Coding Style` and :ref:`Coding Guidelines`.
Douglas Raillardd7c21b72017-06-28 15:23:03 +010031
32 - Use the checkpatch.pl script provided with the Linux source tree. A
Paul Beesleyd2fcc4e2019-05-29 13:59:40 +010033 Makefile target is provided for convenience.
Douglas Raillardd7c21b72017-06-28 15:23:03 +010034
35- Keep the commits on topic. If you need to fix another bug or make another
Sandrine Bailleux6ef77ce2020-08-03 10:27:19 +020036 enhancement, please address it on a separate topic branch.
Douglas Raillardd7c21b72017-06-28 15:23:03 +010037- Avoid long commit series. If you do have a long series, consider whether
38 some commits should be squashed together or addressed in a separate topic.
39- Make sure your commit messages are in the proper format. If a commit fixes
Louis Mayencourt72ef3d42019-03-22 11:47:22 +000040 an `issue`_, include a reference.
Douglas Raillardd7c21b72017-06-28 15:23:03 +010041- Where appropriate, please update the documentation.
42
Paul Beesleyd2fcc4e2019-05-29 13:59:40 +010043 - Consider whether the :ref:`Porting Guide`,
44 :ref:`Firmware Design` document or other in-source documentation needs
45 updating.
Douglas Raillardd7c21b72017-06-28 15:23:03 +010046 - Ensure that each changed file has the correct copyright and license
47 information. Files that entirely consist of contributions to this
Joanna Farley424ef752018-11-13 10:52:12 +000048 project should have a copyright notice and BSD-3-Clause SPDX license
Paul Beesleyf8640672019-04-12 14:19:42 +010049 identifier of the form as shown in :ref:`license`. Files that contain
Joanna Farley424ef752018-11-13 10:52:12 +000050 changes to imported Third Party IP files should retain their original
51 copyright and license notices. For significant contributions you may
52 add your own copyright notice in following format:
Douglas Raillardd7c21b72017-06-28 15:23:03 +010053
54 ::
55
Joanna Farley424ef752018-11-13 10:52:12 +000056 Portions copyright (c) [XXXX-]YYYY, <OWNER>. All rights reserved.
Douglas Raillardd7c21b72017-06-28 15:23:03 +010057
58 where XXXX is the year of first contribution (if different to YYYY) and
Joanna Farley424ef752018-11-13 10:52:12 +000059 YYYY is the year of most recent contribution. <OWNER> is your name or
60 your company name.
Sandrine Bailleuxd3147342020-05-12 10:36:05 +020061 - If you are submitting new files that you intend to be the code owner for
62 (for example, a new platform port), then also update the
63 :ref:`code owners` file.
Douglas Raillardd7c21b72017-06-28 15:23:03 +010064 - For topics with multiple commits, you should make all documentation
65 changes (and nothing else) in the last commit of the series. Otherwise,
66 include the documentation changes within the single commit.
67
Louis Mayencourt72ef3d42019-03-22 11:47:22 +000068- Please test your changes. As a minimum, ensure that Linux boots on the
Paul Beesleyd2fcc4e2019-05-29 13:59:40 +010069 Foundation FVP. See :ref:`Arm Fixed Virtual Platforms (FVP)` for more
70 information. For more extensive testing, consider running the `TF-A Tests`_
71 against your patches.
Douglas Raillardd7c21b72017-06-28 15:23:03 +010072
73Submitting Changes
74------------------
75
76- Ensure that each commit in the series has at least one ``Signed-off-by:``
77 line, using your real name and email address. The names in the
Louis Mayencourt72ef3d42019-03-22 11:47:22 +000078 ``Signed-off-by:`` and ``Author:`` lines must match. If anyone else
79 contributes to the commit, they must also add their own ``Signed-off-by:``
80 line. By adding this line the contributor certifies the contribution is made
Paul Beesleyf8640672019-04-12 14:19:42 +010081 under the terms of the
82 :download:`Developer Certificate of Origin <../../dco.txt>`.
Louis Mayencourt72ef3d42019-03-22 11:47:22 +000083
84 More details may be found in the `Gerrit Signed-off-by Lines guidelines`_.
85
86- Ensure that each commit also has a unique ``Change-Id:`` line. If you have
87 cloned the repository with the "`Clone with commit-msg hook`" clone method
Paul Beesleyd2fcc4e2019-05-29 13:59:40 +010088 (following the :ref:`Prerequisites` document), this should already be the
89 case.
Douglas Raillardd7c21b72017-06-28 15:23:03 +010090
Louis Mayencourt72ef3d42019-03-22 11:47:22 +000091 More details may be found in the `Gerrit Change-Ids documentation`_.
92
93- Submit your changes for review at https://review.trustedfirmware.org
94 targeting the ``integration`` branch.
95
96 - The changes will then undergo further review and testing by the
Sandrine Bailleuxd3147342020-05-12 10:36:05 +020097 :ref:`code owners` and :ref:`maintainers`. Any review comments will be
98 made directly on your patch. This may require you to do some rework. For
99 controversial changes, the discussion might be moved to the `TF-A mailing
100 list`_ to involve more of the community.
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000101
102 Refer to the `Gerrit Uploading Changes documentation`_ for more details.
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100103
Paul Beesleyf8640672019-04-12 14:19:42 +0100104- When the changes are accepted, the :ref:`maintainers` will integrate them.
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100105
Paul Beesleyf8640672019-04-12 14:19:42 +0100106 - Typically, the :ref:`maintainers` will merge the changes into the
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000107 ``integration`` branch.
108 - If the changes are not based on a sufficiently-recent commit, or if they
Paul Beesleyf8640672019-04-12 14:19:42 +0100109 cannot be automatically rebased, then the :ref:`maintainers` may rebase it
Sandrine Bailleuxd3147342020-05-12 10:36:05 +0200110 on the ``integration`` branch or ask you to do so.
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000111 - After final integration testing, the changes will make their way into the
Sandrine Bailleuxd3147342020-05-12 10:36:05 +0200112 ``master`` branch. If a problem is found during integration, the
113 :ref:`maintainers` will request your help to solve the issue. They may
114 revert your patches and ask you to resubmit a reworked version of them or
115 they may ask you to provide a fix-up patch.
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100116
Julius Wernercece91a2019-04-18 16:47:46 -0700117Binary Components
118-----------------
119
120- Platforms may depend on binary components submitted to the `Trusted Firmware
121 binary repository`_ if they require code that the contributor is unable or
122 unwilling to open-source. This should be used as a rare exception.
123- All binary components must follow the contribution guidelines (in particular
124 licensing rules) outlined in the `readme.rst <tf-binaries-readme_>`_ file of
125 the binary repository.
126- Binary components must be restricted to only the specific functionality that
127 cannot be open-sourced and must be linked into a larger open-source platform
128 port. The majority of the platform port must still be implemented in open
129 source. Platform ports that are merely a thin wrapper around a binary
130 component that contains all the actual code will not be accepted.
131- Only platform port code (i.e. in the ``plat/<vendor>`` directory) may rely on
132 binary components. Generic code must always be fully open-source.
133
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100134--------------
135
Paul Beesley07f0a312019-05-16 13:33:18 +0100136*Copyright (c) 2013-2020, Arm Limited and Contributors. All rights reserved.*
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100137
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000138.. _developer.trustedfirmware.org: https://developer.trustedfirmware.org
Sandrine Bailleuxd3147342020-05-12 10:36:05 +0200139.. _review.trustedfirmware.org: https://review.trustedfirmware.org
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000140.. _issue: https://developer.trustedfirmware.org/project/board/1/
John Tsichritzis2fd3d922019-05-28 13:13:39 +0100141.. _Trusted Firmware-A: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git
Douglas Raillardd7c21b72017-06-28 15:23:03 +0100142.. _Git guidelines: http://git-scm.com/book/ch5-2.html
Louis Mayencourt72ef3d42019-03-22 11:47:22 +0000143.. _Gerrit Uploading Changes documentation: https://review.trustedfirmware.org/Documentation/user-upload.html
144.. _Gerrit Signed-off-by Lines guidelines: https://review.trustedfirmware.org/Documentation/user-signedoffby.html
145.. _Gerrit Change-Ids documentation: https://review.trustedfirmware.org/Documentation/user-changeid.html
Sandrine Bailleuxd3147342020-05-12 10:36:05 +0200146.. _TF-A Tests: https://trustedfirmware-a-tests.readthedocs.io
Julius Wernercece91a2019-04-18 16:47:46 -0700147.. _Trusted Firmware binary repository: https://review.trustedfirmware.org/admin/repos/tf-binaries
148.. _tf-binaries-readme: https://git.trustedfirmware.org/tf-binaries.git/tree/readme.rst
Sandrine Bailleuxd3147342020-05-12 10:36:05 +0200149.. _TF-A mailing list: https://lists.trustedfirmware.org/mailman/listinfo/tf-a