Skip to content

Commit bd02761

Browse files
committed
Remove auto-generation for non-secure PSA targets.
Only generate PSA headers/source related to components and services when Secure build is initiated during compile time of PSA targets. Let the Non-secure build rely on the checked-in files already present. Signed-off-by: Vikas Katariya <[email protected]>
1 parent f4a1945 commit bd02761

File tree

4 files changed

+6
-14
lines changed

4 files changed

+6
-14
lines changed

tools/build.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,14 +191,12 @@ def main():
191191
profile = extract_profile(parser, options, internal_tc_name)
192192

193193
if options.source_dir:
194-
if target.is_PSA_target:
194+
resource_filter = None
195+
if target.is_PSA_secure_target:
195196
generate_psa_sources(
196197
source_dirs=options.source_dir,
197198
ignore_paths=[options.build_dir]
198199
)
199-
200-
resource_filter = None
201-
if target.is_PSA_secure_target:
202200
resource_filter = OsAndSpeResourceFilter()
203201

204202
lib_build_res = build_library(

tools/make.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,14 +339,12 @@ def main():
339339
args_error(parser, str(e))
340340

341341
if options.source_dir is not None:
342-
if target.is_PSA_target:
342+
resource_filter = None
343+
if target.is_PSA_secure_target:
343344
generate_psa_sources(
344345
source_dirs=options.source_dir,
345346
ignore_paths=[options.build_dir]
346347
)
347-
348-
resource_filter = None
349-
if target.is_PSA_secure_target:
350348
resource_filter = OsAndSpeResourceFilter()
351349

352350
wrapped_build_project(

tools/project.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,13 +391,11 @@ def main():
391391

392392
try:
393393
target = Target.get_target(mcu)
394-
if target.is_PSA_target:
394+
resource_filter = None
395+
if target.is_PSA_secure_target:
395396
generate_psa_sources(source_dirs=options.source_dir,
396397
ignore_paths=[]
397398
)
398-
399-
resource_filter = None
400-
if target.is_PSA_secure_target:
401399
resource_filter = OsAndSpeResourceFilter()
402400

403401
export(

tools/test.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,6 @@ def main():
243243
resource_filter = None
244244
if target.is_PSA_secure_target:
245245
resource_filter = OsAndSpeResourceFilter()
246-
247-
if target.is_PSA_target:
248246
generate_psa_sources(
249247
source_dirs=base_source_paths,
250248
ignore_paths=[options.build_dir]

0 commit comments

Comments
 (0)