diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2020-01-31 07:35:30 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-01-31 07:35:30 +0000 |
| commit | 989429e8726e55bac78292ead4400649350c4565 (patch) | |
| tree | 3ce4181dbb0289ee85ed810a6b4ee58ce6cffb50 | |
| parent | f69a5828b74ca27bd3872de9c8c6c5a107915c49 (diff) | |
| parent | 6de32378f67f9a1368000a94defa8956c3c7319d (diff) | |
| download | platform_external_arm-trusted-firmware-989429e8726e55bac78292ead4400649350c4565.tar.gz platform_external_arm-trusted-firmware-989429e8726e55bac78292ead4400649350c4565.tar.bz2 platform_external_arm-trusted-firmware-989429e8726e55bac78292ead4400649350c4565.zip | |
Merge "Add support for documentation build as a target in Makefile" into integration
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | docs/change-log-upcoming.rst | 2 | ||||
| -rw-r--r-- | docs/getting_started/docs-build.rst | 21 |
3 files changed, 24 insertions, 9 deletions
@@ -702,6 +702,9 @@ PYTHON ?= python3 PRINT_MEMORY_MAP_PATH ?= tools/memory PRINT_MEMORY_MAP ?= ${PRINT_MEMORY_MAP_PATH}/print_memory_map.py +# Variables for use with documentation build using Sphinx tool +DOCS_PATH ?= docs + ################################################################################ # Include BL specific makefiles ################################################################################ @@ -878,7 +881,7 @@ endif # Build targets ################################################################################ -.PHONY: all msg_start clean realclean distclean cscope locate-checkpatch checkcodebase checkpatch fiptool sptool fip fwu_fip certtool dtbs memmap +.PHONY: all msg_start clean realclean distclean cscope locate-checkpatch checkcodebase checkpatch fiptool sptool fip fwu_fip certtool dtbs memmap doc .SUFFIXES: all: msg_start @@ -1076,6 +1079,10 @@ romlib.bin: libraries memmap: all ${Q}${PYTHON} $(PRINT_MEMORY_MAP) $(BUILD_PLAT) +doc: + @echo " BUILD DOCUMENTATION" + ${Q}${MAKE} --no-print-directory -C ${DOCS_PATH} html + cscope: @echo " CSCOPE" ${Q}find ${CURDIR} -name "*.[chsS]" > cscope.files @@ -1116,6 +1123,7 @@ help: @echo " sptool Build the Secure Partition Package creation tool" @echo " dtbs Build the Device Tree Blobs (if required for the platform)" @echo " memmap Print the memory map of the built binaries" + @echo " doc Build html based documentation using Sphinx tool" @echo "" @echo "Note: most build targets require PLAT to be set to a specific platform." @echo "" diff --git a/docs/change-log-upcoming.rst b/docs/change-log-upcoming.rst index 3d7d5094d..14280cbf7 100644 --- a/docs/change-log-upcoming.rst +++ b/docs/change-log-upcoming.rst @@ -23,7 +23,7 @@ New Features - Example: "Add support for Branch Target Identification (BTI)" - Build System - - Example: "Add support for default stack-protector flag" + - Add support for documentation build as a target in Makefile - CPU Support - Example: "cortex-a55: Workaround for erratum 1221012" diff --git a/docs/getting_started/docs-build.rst b/docs/getting_started/docs-build.rst index c5625e98d..91b1b3a39 100644 --- a/docs/getting_started/docs-build.rst +++ b/docs/getting_started/docs-build.rst @@ -56,21 +56,28 @@ as root or using ``sudo``. Building rendered documentation ------------------------------- -From the ``docs`` directory of the project, run the following commands. It is -important to note that you will not get the correct result if the commands are -run from the project root directory, as that would invoke the top-level Makefile -for |TF-A| itself. +Documents can be built into HTML-formatted pages from project root directory by +running the following command. .. code:: shell - make clean - make html + make doc Output from the build process will be placed in: :: - <tf-a root>/docs/build/html/ + docs/build/html/ + +We also support building documentation in other formats. From the ``docs`` +directory of the project, run the following command to see the supported +formats. It is important to note that you will not get the correct result if +the command is run from the project root directory, as that would invoke the +top-level Makefile for |TF-A| itself. + +.. code:: shell + + make help -------------- |