summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorChris Wright <chris.wright@mqa.co.uk>2022-03-24 11:35:40 (GMT)
committerChris Wright <chris.wright@mqa.co.uk>2022-04-04 16:05:09 (GMT)
commit87142bbd5f94de9591b0a5531e427a5f491f56fd (patch)
tree51605139a9795d58fadc2b2a2fe693795cebe41a /Help
parente9eabb0dcdb2fd8084135e02a1ad63047f8ae772 (diff)
downloadCMake-87142bbd5f94de9591b0a5531e427a5f491f56fd.zip
CMake-87142bbd5f94de9591b0a5531e427a5f491f56fd.tar.gz
CMake-87142bbd5f94de9591b0a5531e427a5f491f56fd.tar.bz2
ADSP: Add dedicated platform module
Diffstat (limited to 'Help')
-rw-r--r--Help/envvar/ADSP_ROOT.rst8
-rw-r--r--Help/manual/cmake-env-variables.7.rst1
-rw-r--r--Help/manual/cmake-toolchains.7.rst22
-rw-r--r--Help/manual/cmake-variables.7.rst1
-rw-r--r--Help/release/dev/adsp-platform-and-compilers.rst6
-rw-r--r--Help/variable/CMAKE_ADSP_ROOT.rst9
6 files changed, 47 insertions, 0 deletions
diff --git a/Help/envvar/ADSP_ROOT.rst b/Help/envvar/ADSP_ROOT.rst
new file mode 100644
index 0000000..fabf1bb
--- /dev/null
+++ b/Help/envvar/ADSP_ROOT.rst
@@ -0,0 +1,8 @@
+ADSP_ROOT
+---------
+
+.. include:: ENV_VAR.txt
+
+The ``ADSP_ROOT`` environment variable specifies a default value
+for the :variable:`CMAKE_ADSP_ROOT` variable when there is no explicit
+configuration given on the first run while creating a new build tree.
diff --git a/Help/manual/cmake-env-variables.7.rst b/Help/manual/cmake-env-variables.7.rst
index fc14262..737b22c 100644
--- a/Help/manual/cmake-env-variables.7.rst
+++ b/Help/manual/cmake-env-variables.7.rst
@@ -28,6 +28,7 @@ Environment Variables that Control the Build
.. toctree::
:maxdepth: 1
+ /envvar/ADSP_ROOT
/envvar/CMAKE_APPLE_SILICON_PROCESSOR
/envvar/CMAKE_BUILD_PARALLEL_LEVEL
/envvar/CMAKE_BUILD_TYPE
diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst
index a941310..e194df0 100644
--- a/Help/manual/cmake-toolchains.7.rst
+++ b/Help/manual/cmake-toolchains.7.rst
@@ -301,6 +301,28 @@ Windows Store may look like this:
set(CMAKE_SYSTEM_NAME WindowsStore)
set(CMAKE_SYSTEM_VERSION 8.1)
+.. _`Cross Compiling for ADSP SHARC/Blackfin`:
+
+Cross Compiling for ADSP SHARC/Blackfin
+---------------------------------------
+
+Cross-compiling for ADSP SHARC or Blackfin can be configured
+by setting the :variable:`CMAKE_SYSTEM_NAME` variable to ``ADSP``
+and the :variable:`CMAKE_SYSTEM_PROCESSOR` variable
+to the "part number", excluding the ``ADSP-`` prefix,
+for example, ``21594``, ``SC589``, etc.
+This value is case insensitive.
+
+CMake will automatically search for CCES or VDSP++ installs
+in their default install locations
+and select the most recent version found.
+CCES will be selected over VDSP++ if both are installed.
+Custom install paths can be set via the :variable:`CMAKE_ADSP_ROOT` variable
+or the :envvar:`ADSP_ROOT` environment variable.
+
+The compiler (``cc21k`` vs. ``ccblkfn``) is selected automatically
+based on the :variable:`CMAKE_SYSTEM_PROCESSOR` value provided.
+
.. _`Cross Compiling for Android`:
Cross Compiling for Android
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 0b81677..f8ae337 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -346,6 +346,7 @@ Variables that Control the Build
.. toctree::
:maxdepth: 1
+ /variable/CMAKE_ADSP_ROOT
/variable/CMAKE_AIX_EXPORT_ALL_SYMBOLS
/variable/CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS
/variable/CMAKE_ANDROID_API
diff --git a/Help/release/dev/adsp-platform-and-compilers.rst b/Help/release/dev/adsp-platform-and-compilers.rst
index 3b8ac5a..396b29d 100644
--- a/Help/release/dev/adsp-platform-and-compilers.rst
+++ b/Help/release/dev/adsp-platform-and-compilers.rst
@@ -5,3 +5,9 @@ adsp-platform-and-compilers
both CCES and VDSP++ installations,
with required configuration now done in the compiler module itself
rather than the Generic-ADSP platform module.
+
+* A dedicated ``ADSP`` platform has been added
+ to replace the existing ``Generic-ADSP`` implementation.
+ This features automatic detection of the latest CCES/VDSP++ install
+ and compiler selection (``cc21k`` vs. ``ccblkfn``)
+ based off of the :variable:`CMAKE_SYSTEM_PROCESSOR` variable.
diff --git a/Help/variable/CMAKE_ADSP_ROOT.rst b/Help/variable/CMAKE_ADSP_ROOT.rst
new file mode 100644
index 0000000..e6d903d
--- /dev/null
+++ b/Help/variable/CMAKE_ADSP_ROOT.rst
@@ -0,0 +1,9 @@
+CMAKE_ADSP_ROOT
+---------------
+
+When :ref:`Cross Compiling for ADSP SHARC/Blackfin`,
+this variable holds the absolute path to the latest CCES or VDSP++ install.
+The directory is expected to contain the ``cc21k.exe`` and ``ccblkfn.exe`` compilers.
+This will be set automatically if a default install of CCES or VDSP++ can be found.
+
+See also the :envvar:`ADSP_ROOT` environment variable.