Build: Move NSCE into extra_params
NSCE is not a common config which is needed in all config groups.
To make CI configs easier to maintain, move NSCE into extra_params.
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I9d9690126d2c9d621bf6e6262a37947f1546e290
diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index 8b7841d..dc2be67 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -85,7 +85,8 @@
"-DTEST_NS_T_COSE=OFF "
"-DTEST_S_T_COSE=OFF "
"-DTEST_NS_PS=OFF "
- "-DTEST_S_PS=OFF ")}
+ "-DTEST_S_PS=OFF "),
+ "NSCE": "-DTFM_NS_MANAGE_NSID=ON "}
class TFM_Build_Manager(structuredTask):
""" Class that will load a configuration out of a json file, schedule
@@ -157,7 +158,6 @@
"NS={}",
"PROFILE={}",
"PARTITION_PS={}",
- "NSCE={}",
"MMIO={}",
"FP={}",
"LAZY={}",
@@ -179,7 +179,6 @@
config_details.with_ns,
"N.A" if not config_details.profile else config_details.profile,
config_details.partition_ps,
- config_details.nsce,
config_details.mmio,
config_details.fp,
config_details.lazy,
@@ -442,7 +441,6 @@
"with_ns": i.with_ns,
"profile": "" if i.profile=="N.A" else i.profile,
"partition_ps": i.partition_ps,
- "nsce": i.nsce,
"mmio": i.mmio,
"fp": i.fp,
"lazy": i.lazy,
@@ -636,15 +634,13 @@
if list(i)[11] == "OFF": #PARTITION_PS
config_param.append("PSOFF")
if list(i)[12] == "ON":
- config_param.append("NSCE")
- if list(i)[13] == "ON":
config_param.append("MMIO")
- if list(i)[14] == "1" or list(i)[14] == "2":
- config_param.append(mapSFPOption[list(i)[14]]) #FP
- if list(i)[15] == "ON": # LAZY
+ if list(i)[13] == "1" or list(i)[13] == "2":
+ config_param.append(mapSFPOption[list(i)[13]]) #FP
+ if list(i)[14] == "ON": # LAZY
config_param.append("SLAZY")
- if list(i)[16]: # EXTRA_PARAMS
- config_param.append(list(i)[16])
+ if list(i)[15]: # EXTRA_PARAMS
+ config_param.append(list(i)[15])
i_str = "_".join(config_param)
ret_cfg[i_str] = i
return ret_cfg