Skip to content

Commit 3356ba3

Browse files
committed
docs: Decouple refrences from /docs folder
Signed-off-by: Anton Komlev <[email protected]> Change-Id: I1955201382074eb9e6dd80aadbc456eb09aecb22
1 parent 5d5d40f commit 3356ba3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+147
-143
lines changed

docs/conf.py.in

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
#
2121
import os
2222
import sys
23-
sys.path.insert(0, os.path.abspath('..'))
24-
sys.path.insert(0, os.path.abspath('../docs'))
2523

2624
# -- Project information -----------------------------------------------------
2725

docs/contributing/code_review_guide.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Code Review Guideline
44
The purpose of this document is to clarify design items to be reviewed during
55
the code review process.
66

7-
Please contact :doc:`maintainers </docs/contributing/maintainers>` or write an e-mail
7+
Please contact :doc:`maintainers </contributing/maintainers>` or write an e-mail
88
thread on the `TF-M mailing list <mailto:[email protected]>`_ for
99
any questions.
1010

@@ -13,9 +13,9 @@ List of the guidelines
1313
**********************
1414
The prerequisites before going to the review stage:
1515

16-
- Read the :doc:`Contributing Process </docs/contributing/contributing_process>`
16+
- Read the :doc:`Contributing Process </contributing/contributing_process>`
1717
to know basic concepts.
18-
- Read the :doc:`Source Structure </docs/technical_references/design_docs/source_structure>`
18+
- Read the :doc:`Source Structure </technical_references/design_docs/source_structure>`
1919
for structure related reference.
2020

2121
The review guidelines consist of these items:

docs/contributing/coding_guide.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ remain within clear scope.
1818
The guidance below is provided as a help. It isn't meant to be a definitive
1919
list.
2020

21-
As implied in the :doc:`contributing guide </docs/contributing/contributing_process>`
21+
As implied in the :doc:`contributing guide </contributing/contributing_process>`
2222
maintainers have the right to decide on what's acceptable in case of any
2323
divergence.
2424

docs/contributing/contributing_process.rst

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Contributions to the TF-M project need to follow the process below.
55

66
.. Note::
77

8-
Please contact :doc:`maintainers </docs/contributing/maintainers>` for any
8+
Please contact :doc:`maintainers </contributing/maintainers>` for any
99
questions.
1010

1111
- Subscribe to `TF-M development
@@ -19,22 +19,22 @@ Contributions to the TF-M project need to follow the process below.
1919
<https://developer.trustedfirmware.org/maniphest>`_, put as many details as
2020
possible in the description. Add 'Trusted Firmware M' in the 'Tags' field.
2121
- For non-trivial changes, need to follow the design proposal process
22-
:doc:`Design Proposal Guideline </docs/contributing/tfm_design_proposal_guideline>`
22+
:doc:`Design Proposal Guideline </contributing/tfm_design_proposal_guideline>`
2323
for the TF-M project.
2424
- After the design has been accepted by the maintainer(s), a corresponding
2525
patch should be posted; follow guidelines below:
2626

2727
- Clone the TF-M code on your own machine from `TF-M git repository
2828
<https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git>`_.
29-
- Follow the :doc:`TF-M getting started </docs/getting_started/tfm_getting_started>`,
30-
:doc:`Build Instructions </docs/technical_references/instructions/tfm_build_instruction>` and
31-
:doc:`Coding Guide </docs/contributing/coding_guide>` for the TF-M project.
29+
- Follow the :doc:`TF-M getting started </getting_started/tfm_getting_started>`,
30+
:doc:`Build Instructions </technical_references/instructions/tfm_build_instruction>` and
31+
:doc:`Coding Guide </contributing/coding_guide>` for the TF-M project.
3232
- Make your changes in logical chunks to help reviewers. Each commit should
3333
be a separate review and either work properly or be squashed after the
3434
review and before merging.
3535
- Update documentation in docs/ folder if needed.
3636
- Test your changes and add details to the commit description.
37-
- The code is accepted under :doc:`DCO </docs/contributing/dco>`, Developer
37+
- The code is accepted under :doc:`DCO </contributing/dco>`, Developer
3838
Certificate of Origin, so you must add following fields to your
3939
commit description:
4040

@@ -66,7 +66,7 @@ Contributions to the TF-M project need to follow the process below.
6666
6767
git push https://review.trustedfirmware.org/TF-M/trusted-firmware-m.git HEAD:refs/for/master
6868
69-
- Add relevant :doc:`maintainers </docs/contributing/maintainers>` for reviewing
69+
- Add relevant :doc:`maintainers </contributing/maintainers>` for reviewing
7070
the patch.
7171
- You may be asked to provide further details or make additional changes.
7272
- You can discuss further with maintainer(s) by directly over email if

docs/contributing/doc_guidelines.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The following short-list provides a quick summary of the rules.
2020

2121
- If the patch modifies a present file, the file's style should be followed
2222
- If creating a new file,
23-
:doc:`integration guide </docs/integration_guide/tfm_integration_guide>` can be used as a reference.
23+
:doc:`integration guide </integration_guide/tfm_integration_guide>` can be used as a reference.
2424
- When a new style is to be expressed, consult the `Python Documentation Guidelines`_
2525

2626
*************
@@ -186,8 +186,8 @@ will not be added to the index (So it cannot be referenced if needed)
186186
+--------------+--------------+-------------+
187187
188188
Other types of tables such as list-tables and csv-tables are also permitted, as
189-
seen on :doc:`/docs/getting_started/tfm_getting_started` and
190-
:doc:`/docs/releases/1.0`
189+
seen on :doc:`/getting_started/tfm_getting_started` and
190+
:doc:`/releases/1.0`
191191

192192

193193
External Links
@@ -236,7 +236,7 @@ A document included in the documentation can be referenced by the `doc:` notatio
236236

237237
.. code-block:: restructuredtext
238238
239-
:doc:`integration guide </docs/integration_guide/tfm_integration_guide>`
239+
:doc:`integration guide </integration_guide/tfm_integration_guide>`
240240
241241
The path is relative to the root of the Trusted Firmware-M code.
242242

@@ -260,7 +260,7 @@ Glossary term
260260
=============
261261

262262
For technical terms and abbreviations, the recommended guidance is to add an
263-
entry to the :doc:`/docs/glossary` and refer to it, using the `term:`
263+
entry to the :doc:`/glossary` and refer to it, using the `term:`
264264
directive
265265

266266

@@ -293,7 +293,7 @@ References
293293
.. _Sphinx: https://www.sphinx-doc.org/en/master/
294294
.. _Restructed Text: https://docutils.sourceforge.io/rst.html
295295
.. _Python Documentation Guidelines: https://devguide.python.org/documenting/#style-guide
296-
.. _Pygments Lexers: https://pygments.org/docs/lexers/
296+
.. _Pygments Lexers: https://pygments.org/lexers/
297297

298298
--------------
299299

docs/contributing/tfm_design_proposal_guideline.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Reference
111111
112112
.. [3] `TF-M gerrit <https://review.trustedfirmware.org/q/project:TF-M/trusted-firmware-m>`_
113113
114-
.. [4] :doc:`Contributing process </docs/contributing/contributing_process>`
114+
.. [4] :doc:`Contributing process </contributing/contributing_process>`
115115
116116
-------------------
117117

docs/getting_started/tfm_getting_started.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -415,10 +415,10 @@ Next steps
415415

416416
Here are some next steps for exploring TF-M:
417417

418-
- Detailed :doc:`Build instructions </docs/technical_references/instructions/tfm_build_instruction>`.
419-
- :doc:`IAR Build instructions </docs/technical_references/instructions/tfm_build_instruction_iar>`.
420-
- Try other :doc:`Samples and Demos </docs/technical_references/instructions/run_tfm_examples_on_arm_platforms>`.
421-
- :doc:`Documentation generation </docs/technical_references/instructions/documentation_generation>`.
418+
- Detailed :doc:`Build instructions </technical_references/instructions/tfm_build_instruction>`.
419+
- :doc:`IAR Build instructions </technical_references/instructions/tfm_build_instruction_iar>`.
420+
- Try other :doc:`Samples and Demos </technical_references/instructions/run_tfm_examples_on_arm_platforms>`.
421+
- :doc:`Documentation generation </technical_references/instructions/documentation_generation>`.
422422

423423
--------------
424424

docs/index.rst

+15-15
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ Trusted Firmware-M Documentation
1515

1616
<ul class="grid">
1717
<li class="grid-item">
18-
<a href="docs/introduction/readme.html">
18+
<a href="introduction/readme.html">
1919
<img alt="" src="_static/images/tfm-introduction.png"/>
2020
<h2>Introduction</h2>
2121
</a>
2222
<p>Introducing the Trusted Firmware-M Project: overview,
2323
architecture, features, and licensing.</p>
2424
</li>
2525
<li class="grid-item">
26-
<a href="docs/getting_started/index.html">
26+
<a href="getting_started/index.html">
2727
<img alt="" src="_static/images/tfm-documentation.png"/>
2828
<h2>Getting Started</h2>
2929
</a>
@@ -38,37 +38,37 @@ Trusted Firmware-M Documentation
3838
<p>List of supported boards and platforms.</p>
3939
</li>
4040
<li class="grid-item">
41-
<a href="docs/contributing/index.html">
41+
<a href="contributing/index.html">
4242
<img alt="" src="_static/images/tfm-contribution.png"/>
4343
<h2>Contribution</h2>
4444
</a>
4545
<p>As an open-source project, we welcome and encourage the community
4646
to submit patches directly to the project.</p>
4747
</li>
4848
<li class="grid-item">
49-
<a href="docs/integration_guide/index.html">
49+
<a href="integration_guide/index.html">
5050
<img alt="" src="_static/images/tfm-integration.png"/>
5151
<h2>Integration</h2>
5252
</a>
5353
<p>Guidelines for integration with TF-M.</p>
5454
</li>
5555
<li class="grid-item">
56-
<a href="docs/technical_references/index.html">
56+
<a href="technical_references/index.html">
5757
<img alt="" src="_static/images/tfm-reference.png"/>
5858
<h2>References</h2>
5959
</a>
6060
<p>Design documents.</p>
6161
</li>
6262
<li class="grid-item">
63-
<a href="docs/security/index.html">
63+
<a href="security/index.html">
6464
<img alt="" src="_static/images/tfm.png"/>
6565
<h2>Security</h2>
6666
</a>
6767
<p>Requirements, processes, and thread models for ensuring security
6868
is addressed within the TF-M project.</p>
6969
</li>
7070
<li class="grid-item">
71-
<a href="docs/releases/index.html">
71+
<a href="releases/index.html">
7272
<img alt="" src="_static/images/tfm-release.png"/>
7373
<h2>Releases</h2>
7474
</a>
@@ -84,14 +84,14 @@ Trusted Firmware-M Documentation
8484
:hidden:
8585

8686
Home<self>
87-
docs/introduction/index
88-
docs/getting_started/index
87+
introduction/index
88+
getting_started/index
8989
platform/ext/index
90-
docs/contributing/index
91-
docs/integration_guide/index
92-
docs/technical_references/index
93-
docs/security/index
94-
docs/releases/index
90+
contributing/index
91+
integration_guide/index
92+
technical_references/index
93+
security/index
94+
releases/index
9595

9696

9797
.. toctree::
@@ -102,7 +102,7 @@ Trusted Firmware-M Documentation
102102
API Reference <https://ci.trustedfirmware.org/view/TF-M/job/tf-m-build-docs-nightly/lastSuccessfulBuild/artifact/trusted-firmware-m/build/docs/reference_manual/html/index.html>
103103
Security Center <https://developer.trustedfirmware.org/w/collaboration/security_center>
104104
Platform Security Architecture <https://developer.arm.com/architectures/security-architectures/platform-security-architecture>
105-
docs/glossary
105+
glossary
106106

107107
--------------
108108

docs/integration_guide/os_migration_guide_armv8m.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ List of requirements
1818
value used in Handler mode transitions needs to be differentiated between
1919
Secure and Non Secure builds, i.e. ``0xFD`` and ``0xBC``, respectively.
2020
- If the OS manages the non-secure client identification, pelase check the
21-
:doc:`Non-secure Client Extension Integration Guide </docs/integration_guide/non-secure_client_extension_integration_guide>`.
21+
:doc:`Non-secure Client Extension Integration Guide </integration_guide/non-secure_client_extension_integration_guide>`.
2222

2323
--------------
2424

docs/integration_guide/porting_TFM_to_a_new_hardware.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ exist on the platform for TF-M (S and NS) to run on this new platform.
1010
******************
1111
TF-M in a nutshell
1212
******************
13-
For an overview please refer to :doc:`Introduction </docs/introduction/readme>`.
13+
For an overview please refer to :doc:`Introduction </introduction/readme>`.
1414

1515
*************
1616
Prerequisites
@@ -19,12 +19,12 @@ Building environnement
1919
======================
2020
Make sure you have a working build environnement and that you can build
2121
TF-M on AN521 following the
22-
:doc:`Build instructions </docs/technical_references/instructions/tfm_build_instruction>`.
22+
:doc:`Build instructions </technical_references/instructions/tfm_build_instruction>`.
2323

2424
Toolchains and software requirements
2525
====================================
2626

27-
Please follow the :doc:`Getting started guide </docs/getting_started/tfm_getting_started>`.
27+
Please follow the :doc:`Getting started guide </getting_started/tfm_getting_started>`.
2828

2929
CMSIS Drivers
3030
=============
@@ -59,7 +59,7 @@ In a nutshell, this should be a 6 iterative steps process:
5959

6060
#. Running the regression tests
6161

62-
- See :doc:`Running TF-M on Arm platforms </docs/technical_references/instructions/run_tfm_examples_on_arm_platforms>`
62+
- See :doc:`Running TF-M on Arm platforms </technical_references/instructions/run_tfm_examples_on_arm_platforms>`
6363
as an example
6464

6565

docs/integration_guide/services/tfm_attestation_integration_guide.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -625,9 +625,9 @@ that user has license for DS-5 and FVP models:
625625

626626
- Build TF-M with any of the ``ConfigRegression*.cmake`` build configurations
627627
for MPS2 AN521 platform. More info in
628-
:doc:`tfm_build_instruction </docs/technical_references/instructions/tfm_build_instruction>`.
628+
:doc:`tfm_build_instruction </technical_references/instructions/tfm_build_instruction>`.
629629
- Lunch FVP model in DS-5. More info in
630-
:doc:`Run TF-M examples on Arm platforms </docs/technical_references/instructions/run_tfm_examples_on_arm_platforms>`.
630+
:doc:`Run TF-M examples on Arm platforms </technical_references/instructions/run_tfm_examples_on_arm_platforms>`.
631631
- Set a breakpoint in ``test/secure_fw/suites/attestation/attest_token_test.c``
632632
in ``decode_test_internal(..)`` after the ``token_main_alt(..)`` returned,
633633
i.e. on line 859. Execute the code in the model until the breakpoint hits

docs/integration_guide/services/tfm_ps_integration_guide.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ The ITS filesystem and flash interfaces and their implementation can be found in
156156
``secure_fw/partitions/internal_trusted_storage/flash`` respectively. More
157157
information about the filesystem and flash interfaces can be found in the
158158
:doc:`ITS integration guide
159-
</docs/integration_guide/services/tfm_its_integration_guide>`.
159+
</integration_guide/services/tfm_its_integration_guide>`.
160160

161161
The ITS service implementation in
162162
``secure_fw/partitions/internal_trusted_storage/tfm_internal_trusted_storage.c``,
@@ -291,14 +291,14 @@ TF-M core tracks the current client IDs running in the secure or non-secure
291291
processing environment. It provides a dedicated API to retrieve the client ID
292292
which performs the service request.
293293

294-
:doc:`Non-secure Client Extension Integration Guide </docs/integration_guide/non-secure_client_extension_integration_guide>`
294+
:doc:`Non-secure Client Extension Integration Guide </integration_guide/non-secure_client_extension_integration_guide>`
295295
provides further details on how client identification works.
296296

297297
PS service uses that TF-M core API to retrieve the client ID and associate it
298298
as the owner of an asset. Only the owner can read, write or delete that asset
299299
based on the creation flags.
300300

301-
The :doc:`integration guide </docs/integration_guide/tfm_integration_guide>`
301+
The :doc:`integration guide </integration_guide/tfm_integration_guide>`
302302
provides further details of non-secure implementation requirements for TF-M.
303303

304304
Cryptographic Interface

docs/integration_guide/services/tfm_psa_proxy_integration_guide.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ TF-M PSA Proxy partition is responsible for forwarding all the PSA RoT messages
99
to a Secure Enclave, this way virtually providing all the PSA RoT services.
1010
Proxy can only be used in IPC model, for context and design details please
1111
check the
12-
:doc:`Secure Enclave design document </docs/technical_references/design_docs/secure_enclave_solution>`.
12+
:doc:`Secure Enclave design document </technical_references/design_docs/secure_enclave_solution>`.
1313

1414
Currently to forward the PSA Client call parameters Proxy must read them with
1515
``psa_read`` into a memory area shared with the Secure Enclave. (Similarily

docs/integration_guide/services/tfm_secure_partition_addition.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ it from somewhere. One option is to create a new testsuite, such as
555555
interface_testsuite.c``.
556556

557557
The process of adding test connection is explained in the specification
558-
:doc:`Adding TF-M Regression Test Suite </docs/integration_guide/tfm_test_suites_addition>`
558+
:doc:`Adding TF-M Regression Test Suite </integration_guide/tfm_test_suites_addition>`
559559

560560
.. code-block:: c
561561

docs/integration_guide/tfm_fpu_support.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Reference
105105
106106
.. [5] `Arm® Platform Security Architecture Firmware Framework 1.0 <https://armkeil.blob.core.windows.net/developer/Files/pdf/PlatformSecurityArchitecture/Architect/DEN0063-PSA_Firmware_Framework-1.0.0-2.pdf>`_
107107
108-
.. [6] :doc:`Secure Interrupt Integration Guide </docs/integration_guide/tfm_secure_irq_integration_guide>`
108+
.. [6] :doc:`Secure Interrupt Integration Guide </integration_guide/tfm_secure_irq_integration_guide>`
109109
110110
.. [7] `Musca-S1 Test Chip Board <https://developer.arm.com/tools-and-software/development-boards/iot-test-chips-and-boards/musca-s1-test-chip-board>`_
111111

docs/integration_guide/tfm_integration_guide.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ with other hardware platforms and operating systems.
77
*****************
88
How to build TF-M
99
*****************
10-
Follow the :doc:`Build instructions </docs/technical_references/instructions/tfm_build_instruction>`.
10+
Follow the :doc:`Build instructions </technical_references/instructions/tfm_build_instruction>`.
1111

1212
********************************************************
1313
How to export files for building non-secure applications
1414
********************************************************
15-
Explained in the :doc:`Build instructions </docs/technical_references/instructions/tfm_build_instruction>`.
15+
Explained in the :doc:`Build instructions </technical_references/instructions/tfm_build_instruction>`.
1616

1717
*************************
1818
How to add a new platform
1919
*************************
2020

21-
:doc:`Porting TF-M to a New Hardware </docs/integration_guide/porting_TFM_to_a_new_hardware>`
21+
:doc:`Porting TF-M to a New Hardware </integration_guide/porting_TFM_to_a_new_hardware>`
2222
contains guidance on how to add a new platform.
2323

2424
***************************
@@ -58,7 +58,7 @@ See ``interface/src/tfm_ns_interface.c.example`` for more details.
5858

5959
TF-M provides a reference implementation of NS mailbox on multi-core platforms,
6060
under folder ``interface/src/multi_core``.
61-
See :doc:`Mailbox design </docs/technical_references/design_docs/dual-cpu/mailbox_design_on_dual_core_system>`
61+
See :doc:`Mailbox design </technical_references/design_docs/dual-cpu/mailbox_design_on_dual_core_system>`
6262
for TF-M multi-core mailbox design.
6363

6464
Interface with non-secure world regression tests
@@ -86,7 +86,7 @@ If SPM manages the NSID (default option), then the same NSID (-1) will be used
8686
for all connections from NS clients.
8787
For the case that NSPE RTOS manages the NSID and/or different NSIDs should be
8888
used for different NS clients. See
89-
:doc:`Non-secure Client Extension Integration Guide </docs/integration_guide/non-secure_client_extension_integration_guide>`.
89+
:doc:`Non-secure Client Extension Integration Guide </integration_guide/non-secure_client_extension_integration_guide>`.
9090

9191
*********************
9292
Non-secure interrupts

0 commit comments

Comments
 (0)