aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2018-07-25 15:23:58 +0100
committerGitHub <noreply@github.com>2018-07-25 15:23:58 +0100
commite16d459daa902f8e6393ea2320743183d9c9e16f (patch)
tree4a184365675669ced44045da65c1364d338c328c /docs
parentcad25f1484a6eadfd860daa4dd06c31685287bf9 (diff)
parent4901c533d52bffdc54949e91e6450f69bbe6ae95 (diff)
downloadplatform_external_arm-trusted-firmware-e16d459daa902f8e6393ea2320743183d9c9e16f.tar.gz
platform_external_arm-trusted-firmware-e16d459daa902f8e6393ea2320743183d9c9e16f.tar.bz2
platform_external_arm-trusted-firmware-e16d459daa902f8e6393ea2320743183d9c9e16f.zip
Merge pull request #1492 from jts-arm/docs
Reword LOAD_IMAGE_V2 in user guide & fix a typo
Diffstat (limited to 'docs')
-rw-r--r--docs/porting-guide.rst4
-rw-r--r--docs/user-guide.rst4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/porting-guide.rst b/docs/porting-guide.rst
index a7a88f649..65f39b0a0 100644
--- a/docs/porting-guide.rst
+++ b/docs/porting-guide.rst
@@ -952,9 +952,9 @@ Function : plat\_disable\_acp()
Argument : void
Return : void
-This api allows a platform to disable the Accelerator Coherency Port (if
+This API allows a platform to disable the Accelerator Coherency Port (if
present) during a cluster power down sequence. The default weak implementation
-doesn't do anything. Since this api is called during the power down sequence,
+doesn't do anything. Since this API is called during the power down sequence,
it has restrictions for stack usage and it can use the registers x0 - x17 as
scratch registers. It should preserve the value in x18 register as it is used
by the caller to store the return address.
diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index da260264a..2b90bece8 100644
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -485,8 +485,8 @@ Common build options
- ``LOAD_IMAGE_V2``: Boolean option to enable support for new version (v2) of
image loading, which provides more flexibility and scalability around what
images are loaded and executed during boot. Default is 0.
- Note: ``TRUSTED_BOARD_BOOT`` is currently only supported for AArch64 when
- ``LOAD_IMAGE_V2`` is enabled.
+
+ Note: this flag must be enabled for AArch32 builds.
- ``LOG_LEVEL``: Chooses the log level, which controls the amount of console log
output compiled into the build. This should be one of the following: