From e980319ec6280358a34032b94afc9cdbef501860 Mon Sep 17 00:00:00 2001
From: Marc Herbert <marc.herbert@intel.com>
Date: Fri, 17 Nov 2023 23:35:44 +0000
Subject: [PATCH] xtensa-build-zephyr.py: remove imx8ulp from --all

As of today's Zephyr commit 92fb8b223825, imx8ulp does not compile.

Do not remove any of its data from `xtensa-build-zephyr.py` but exclude
it from --all

Fixes:
```
scripts/xtensa-build-zephyr.py --all

-- Board: nxp_adsp_imx8ulp
No board named 'nxp_adsp_imx8ulp' found.

CMake Error at zephyr/cmake/modules/boards.cmake:167 (message):
  Invalid BOARD; see above.
Call Stack (most recent call first):
  cmake/modules/zephyr_default.cmake:129 (include)
  share/zephyr-package/cmake/ZephyrConfig.cmake:66 (include)
  share/zephyr-package/cmake/ZephyrConfig.cmake:92 (include_boilerplate)
  CMakeLists.txt:5 (find_package)
```

Fixes 61ccb4c8da75 ("scripts: zephyr: Add support to build sof for
imx8ulp")

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
---
 scripts/xtensa-build-zephyr.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py
index 436af9b288d0..3d2563df6921 100755
--- a/scripts/xtensa-build-zephyr.py
+++ b/scripts/xtensa-build-zephyr.py
@@ -86,7 +86,8 @@ class PlatformConfig:
 	IPC4_CONFIG_OVERLAY: str = "ipc4_overlay.conf"
 	aliases: list = dataclasses.field(default_factory=list)
 
-platform_configs = {
+# These can all be built out of the box. --all builds all these.
+platform_configs_all = {
 	#  Intel platforms
 	"tgl" : PlatformConfig(
 		"tgl", "intel_adsp_cavs25",
@@ -134,6 +135,10 @@ class PlatformConfig:
 		"hifi4_mscale_v2_0_2_prod",
 		RIMAGE_KEY = "key param ignored by imx8m"
 	),
+}
+
+# These cannot be built out of the box yet
+extra_platform_configs = {
 	"imx8ulp" : PlatformConfig(
 		"imx8ulp", "nxp_adsp_imx8ulp",
 		f"RI-2023.11{xtensa_tools_version_postfix}",
@@ -142,14 +147,15 @@ class PlatformConfig:
 	),
 }
 
-platform_names = list(platform_configs)
+platform_configs = platform_configs_all.copy()
+platform_configs.update(extra_platform_configs)
 
 class validate_platforms_arguments(argparse.Action):
 	"""Validates positional platform arguments whether provided platform name is supported."""
 	def __call__(self, parser, namespace, values, option_string=None):
 		if values:
 			for value in values:
-				if value not in platform_names:
+				if value not in platform_configs:
 					raise argparse.ArgumentError(self, f"Unsupported platform: {value}")
 		setattr(namespace, "platforms", values)
 
@@ -174,7 +180,7 @@ def parse_args():
 				"			└── RG-2017.8{}/\n".format(xtensa_tools_version_postfix) +
 				"				└── XtensaTools/\n" +
 			"$XTENSA_TOOLS_ROOT=/path/to/myXtensa ...\n" +
-			f"Supported platforms {platform_names}"))
+			f"Supported platforms: {list(platform_configs)}"))
 
 	parser.add_argument("-a", "--all", required=False, action="store_true",
 						help="Build all currently supported platforms")
@@ -257,7 +263,7 @@ def parse_args():
 	args = parser.parse_args()
 
 	if args.all:
-		args.platforms = platform_names
+		args.platforms = list(platform_configs_all)
 
 	# print help message if no arguments provided
 	if len(sys.argv) == 1: