From 1b6c48e048e706b98a592f183c6c622723bc5fbc Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Fri, 8 Dec 2023 07:18:08 +0000 Subject: [PATCH] boards: xtensa: docs: rimage is no more a separate git repository Fix intel_adsp_generic.rst following the merge of the rimage git repository back into the sof git repository: - https://github.com/thesofproject/sof/issues/7270 (cherry picked from commit 22f751658dc0bbe5a83c0d1bbfc9ad4c30f4bfcd) Original-Signed-off-by: Marc Herbert GitOrigin-RevId: 22f751658dc0bbe5a83c0d1bbfc9ad4c30f4bfcd Change-Id: I79792b8c093f3d95dcbba6365f3edff40e49273c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5109850 Tested-by: Fabio Baltieri Reviewed-by: Fabio Baltieri Commit-Queue: Fabio Baltieri Tested-by: ChromeOS Prod (Robot) --- .../doc/intel_adsp_generic.rst | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/boards/xtensa/intel_adsp_cavs25/doc/intel_adsp_generic.rst b/boards/xtensa/intel_adsp_cavs25/doc/intel_adsp_generic.rst index 737cdbee05b..fe97ed6466a 100644 --- a/boards/xtensa/intel_adsp_cavs25/doc/intel_adsp_generic.rst +++ b/boards/xtensa/intel_adsp_cavs25/doc/intel_adsp_generic.rst @@ -64,9 +64,10 @@ you will also need to set up the SOF rimage signing tool and key. .. code-block:: shell - cd zephyrproject/modules/audio/sof/ - git clone https://github.com/thesofproject/rimage --recurse-submodules - cd rimage + cd zephyrproject + west config manifest.project-filter -- +sof + west update + cd modules/audio/sof/tools/rimage Follow the instructions in the rimage :file:`README.md` to build the tool on your system. You can either copy the executable to a directory in your PATH or @@ -74,21 +75,9 @@ use ``west config rimage.path /path/to/rimage-build/rimage``; see more details in the output of ``west sign -h``. Running directly from the build directory makes you less likely to use an obsolete rimage version by mistake. -Until https://github.com/zephyrproject-rtos/zephyr/issues/58212 gets -implemented, you must manually and regularly update and rebuild rimage. - -The SOF project does not require this manual step because its west manifest -automatically downloads and builds a specific rimage version validated with -matching SOF sources. An indirect Zephyr -> SOF -> rimage dependency chain is -unfortunately not appropriate because unlike rimage, SOF is *not* required to -run Zephyr on cAVS/ACE hardware. - -Until https://github.com/thesofproject/sof/issues/7270 is implemented, -platform-specific configuration files are also located in the rimage -repository, more specifically in the ``rimage/config/`` subdirectory; this is -another reason to update rimage regularly. If you cloned rimage in a location -different from above (not recommended) then you must also run ``west config -build.cmake-args -- -DRIMAGE_CONFIG_PATH=/path/to/source/rimage/config``. +Platform-specific configuration files are located in the ``rimage/config/`` +subdirectory. For a different configuration directory you can use: +``west config build.cmake-args -- -DRIMAGE_CONFIG_PATH=/path/to/my/rimage/config``. Xtensa Toolchain (Optional)