OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

xtensa-build-zephyr.py: use EXTRA_CONF_FILE instead of OVERLAY_CONFIG 

OVERLAY_CONFIG has been deprecated by EXTRA_CONF_FILE since Zephyr 3.4

Also fix the corresponding --help string.

Zephyr 3.4 is one year old and has just been end-of-lifed.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2024-06-26 18:58:35 +00:00 committed by Kai Vehmanen
parent 8d1eea225a
commit 6cd34c89a1
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/xtensa-build-zephyr.py
View File

@ -256,8 +256,15 @@ build-sof-staging (for old, developer /lib/firmware/intel/sof-ipc4/)
" to cmake (for rimage)")
parser.add_argument("-k", "--key", type=pathlib.Path, required=False,
help="Path to a non-default rimage signing key.")
# https://docs.zephyrproject.org/latest/build/kconfig/setting.html#initial-conf
# https://docs.zephyrproject.org/latest/develop/application/index.html#important-build-system-variables
parser.add_argument("-o", "--overlay", type=pathlib.Path, required=False, action='append',
default=[], help="Paths to overlays")
default=[], help=
"""All '-o arg1 -o arg2 ...' arguments are combined into a single -DEXTRA_CONF_FILE='arg1;arg2;...'
list. Files latter in the list seem to have precedence. Direct -C=-DCONFIG_xxx=.. options seem to
have precedence over -DEXTRA_CONF_FILE=... Rely on precedence as little as possible.""")
parser.add_argument("-p", "--pristine", required=False, action="store_true",
help="Perform pristine build removing build directory.")
parser.add_argument("-u", "--update", required=False, action="store_true",
@ -832,7 +839,7 @@ def build_platforms():
if overlays:
overlays = ";".join(overlays)
build_cmd.append(f"-DOVERLAY_CONFIG={overlays}")
build_cmd.append(f"-DEXTRA_CONF_FILE={overlays}")
abs_build_dir = pathlib.Path(west_top, platform_build_dir_name)