bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc: xtensa: keep the CAVS old flasher still works

Browse Source 
Keep the cavstwist.sh it is still working by specifying an
environment variable when CAVS_OLD_FLASHER is set. Provide
a fallback once the client-server-based tool does not work
well in some conditions.

Signed-off-by: Enjia Mai <enjia.mai@intel.com>
This commit is contained in:
Enjia Mai 2022-07-01 02:01:05 +08:00 committed by Anas Nashif
parent 5dd9c21b98
commit a1e388ea2e
5 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boards/xtensa/intel_adsp_cavs15/board.cmake
View File

@ -1,5 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
if($ENV{CAVS_OLD_FLASHER})
board_set_flasher_ifnset(misc-flasher)
board_finalize_runner_args(misc-flasher)
endif()
board_set_flasher_ifnset(intel_adsp)
set(RIMAGE_SIGN_KEY otc_private_key.pem)

5
boards/xtensa/intel_adsp_cavs18/board.cmake
View File

@ -1,5 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
if($ENV{CAVS_OLD_FLASHER})
board_set_flasher_ifnset(misc-flasher)
board_finalize_runner_args(misc-flasher)
endif()
board_set_flasher_ifnset(intel_adsp)
set(RIMAGE_SIGN_KEY otc_private_key.pem)

5
boards/xtensa/intel_adsp_cavs20/board.cmake
View File

@ -1,5 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
if($ENV{CAVS_OLD_FLASHER})
board_set_flasher_ifnset(misc-flasher)
board_finalize_runner_args(misc-flasher)
endif()
board_set_flasher_ifnset(intel_adsp)
set(RIMAGE_SIGN_KEY otc_private_key.pem)

5
boards/xtensa/intel_adsp_cavs25/board.cmake
View File

@ -1,5 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
if($ENV{CAVS_OLD_FLASHER})
board_set_flasher_ifnset(misc-flasher)
board_finalize_runner_args(misc-flasher)
endif()
board_set_flasher_ifnset(intel_adsp)
set(RIMAGE_SIGN_KEY otc_private_key_3k.pem)

7
soc/xtensa/intel_adsp/tools/cavstwist.sh
View File

@ -7,6 +7,7 @@ set -e
# host (e.g. an Up Squared board running Linux). Can be used as the
# hook for both --device-serial-pty and --west-flash, for example:
#
# export CAVS_OLD_FLASHER=1
# export CAVS_HOST=tgl2
# export CAVS_KEY=$HOME/otc_private_key_3k.pem
# export CAVS_RIMAGE=$HOME/rimage
@ -15,6 +16,12 @@ set -e
# --device-serial-pty=$ZEPHYR_BASE/soc/xtensa/intel_adsp/tools/cavstwist.sh \
# --west-flash=$ZEPHYR_BASE/soc/xtensa/intel_adsp/tools/cavstwist.sh
#
# The CAVS_OLD_FLASHER is necessary because now the client-server-based
# cavstool works by default. This is to tell the build system to use
# the misc-flasher as the runner. Please remember to do the command
# "unset CAVS_OLD_FLASHER" when you are going to switch to the
# client-server-based intel_adsp runner.
#
# The device at CAVS_HOST must be accessible via non-interactive ssh
# access and the remote account must have password-free sudo ability.
# (The intent is that isolating the host like this to be a CAVS test