From 87e90558e00d12ad685c3660445f0ec406ef6201 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Sat, 13 Jan 2024 00:56:26 +0000 Subject: [PATCH] xtensa-build-zephyr.py: fail on --deployable-build + older options From experience, no one scrolls up and looks at warnings that are not in the current screen. Signed-off-by: Marc Herbert (cherry picked from commit f4ce8b537b94d8710ff34f88de966dce48d2ba86) --- scripts/xtensa-build-zephyr.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py index 89488b7fdca9..3a5426d470c4 100755 --- a/scripts/xtensa-build-zephyr.py +++ b/scripts/xtensa-build-zephyr.py @@ -309,12 +309,9 @@ def parse_args(): sys.exit(0) if args.deployable_build: - if args.fw_naming == 'AVS': - args.fw_naming = 'SOF' - print("The option '--fw-naming AVS' is ignored for deployable builds.") - if args.use_platform_subdir: - args.use_platform_subdir = False - print("The option '--use-platform-subdir' is ignored for deployable builds.") + if args.fw_naming == 'AVS' or args.use_platform_subdir: + sys.exit("Options '--fw-naming=AVS' and '--use-platform-subdir'" + " are incompatible with --deployable-build.") if args.fw_naming == 'AVS': if not args.use_platform_subdir: