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 <Vikas.Katariya@arm.com>
pull/11685/head
Vikas Katariya 2019-11-07 13:28:06 +00:00
parent f4a1945911
commit bd02761136
4 changed files with 6 additions and 14 deletions

View File

@ -191,14 +191,12 @@ def main():
profile = extract_profile(parser, options, internal_tc_name) profile = extract_profile(parser, options, internal_tc_name)
if options.source_dir: if options.source_dir:
if target.is_PSA_target: resource_filter = None
if target.is_PSA_secure_target:
generate_psa_sources( generate_psa_sources(
source_dirs=options.source_dir, source_dirs=options.source_dir,
ignore_paths=[options.build_dir] ignore_paths=[options.build_dir]
) )
resource_filter = None
if target.is_PSA_secure_target:
resource_filter = OsAndSpeResourceFilter() resource_filter = OsAndSpeResourceFilter()
lib_build_res = build_library( lib_build_res = build_library(

View File

@ -339,14 +339,12 @@ def main():
args_error(parser, str(e)) args_error(parser, str(e))
if options.source_dir is not None: if options.source_dir is not None:
if target.is_PSA_target: resource_filter = None
if target.is_PSA_secure_target:
generate_psa_sources( generate_psa_sources(
source_dirs=options.source_dir, source_dirs=options.source_dir,
ignore_paths=[options.build_dir] ignore_paths=[options.build_dir]
) )
resource_filter = None
if target.is_PSA_secure_target:
resource_filter = OsAndSpeResourceFilter() resource_filter = OsAndSpeResourceFilter()
wrapped_build_project( wrapped_build_project(

View File

@ -391,13 +391,11 @@ def main():
try: try:
target = Target.get_target(mcu) target = Target.get_target(mcu)
if target.is_PSA_target: resource_filter = None
if target.is_PSA_secure_target:
generate_psa_sources(source_dirs=options.source_dir, generate_psa_sources(source_dirs=options.source_dir,
ignore_paths=[] ignore_paths=[]
) )
resource_filter = None
if target.is_PSA_secure_target:
resource_filter = OsAndSpeResourceFilter() resource_filter = OsAndSpeResourceFilter()
export( export(

View File

@ -243,8 +243,6 @@ def main():
resource_filter = None resource_filter = None
if target.is_PSA_secure_target: if target.is_PSA_secure_target:
resource_filter = OsAndSpeResourceFilter() resource_filter = OsAndSpeResourceFilter()
if target.is_PSA_target:
generate_psa_sources( generate_psa_sources(
source_dirs=base_source_paths, source_dirs=base_source_paths,
ignore_paths=[options.build_dir] ignore_paths=[options.build_dir]