Cleanup tools folder.

PSA related hooks are removed from the build system.

Signed-off-by: Devaraj Ranganna <[email protected]>

Author: urutva

tools/build.py

@@ -44,8 +44,6 @@
 from tools.utils import argparse_dir_not_parent
 from tools.utils import NoValidToolchainException
 from tools.utils import print_end_warnings
-from tools.psa import generate_psa_sources, clean_psa_autogen
-from tools.resources import OsAndSpeResourceFilter
 
 def main():
     start = time()
@@ -172,9 +170,6 @@ def main():
     skipped = []
     end_warnings = []
 
-    if options.clean:
-        clean_psa_autogen()
-
     for toolchain in toolchains:
         for target_name in targets:
             target = Target.get_target(target_name)
@@ -197,15 +192,7 @@ def main():
                     profile = extract_profile(parser, options, internal_tc_name)
 
                     if options.source_dir:
-                        if target.is_PSA_target:
-                            generate_psa_sources(
-                                source_dirs=options.source_dir,
-                                ignore_paths=[options.build_dir]
-                            )
-
                         resource_filter = None
-                        if target.is_PSA_secure_target:
-                            resource_filter = OsAndSpeResourceFilter()
 
                         lib_build_res = build_library(
                             options.source_dir, options.build_dir, target, toolchain_name,

tools/build_api.py

@@ -41,7 +41,7 @@
                     MBED_CONFIG_FILE, MBED_LIBRARIES_DRIVERS,
                     MBED_LIBRARIES_PLATFORM, MBED_LIBRARIES_HAL,
                     BUILD_DIR)
-from .resources import Resources, FileType, FileRef, PsaManifestResourceFilter
+from .resources import Resources, FileType, FileRef
 from .notifier.mock import MockNotifier
 from .targets import TARGET_NAMES, TARGET_MAP, CORE_ARCH, Target
 from .libraries import Library
@@ -750,7 +750,6 @@ def build_library(src_paths, build_path, target, toolchain_name,
         res = Resources(notify).scan_with_toolchain(
             src_paths, toolchain, dependencies_paths, inc_dirs=inc_dirs)
         res.filter(resource_filter)
-        res.filter(PsaManifestResourceFilter())
 
         # Copy headers, objects and static libraries - all files needed for
         # static lib

tools/make.py

@@ -55,8 +55,6 @@
 from tools.utils import print_large_string
 from tools.settings import ROOT
 from tools.targets import Target
-from tools.psa import generate_psa_sources, clean_psa_autogen
-from tools.resources import OsAndSpeResourceFilter
 
 def default_args_dict(options):
     return dict(
@@ -305,10 +303,6 @@ def main():
     elif options.list_tests is True:
         print('\n'.join(map(str, sorted(TEST_MAP.values()))))
     else:
-
-        if options.clean:
-            clean_psa_autogen()
-
         # Target
         if options.mcu is None:
             args_error(parser, "argument -m/--mcu is required")
@@ -339,16 +333,7 @@ def main():
             args_error(parser, str(e))
 
         if options.source_dir is not None:
-            if target.is_PSA_target:
-                generate_psa_sources(
-                    source_dirs=options.source_dir,
-                    ignore_paths=[options.build_dir]
-                )
-
             resource_filter = None
-            if target.is_PSA_secure_target:
-                resource_filter = OsAndSpeResourceFilter()
-
             wrapped_build_project(
                 options.source_dir,
                 options.build_dir,

tools/project.py

@@ -53,8 +53,6 @@
 from tools.utils import NotSupportedException
 from tools.options import extract_profile, list_profiles, extract_mcus
 from tools.notifier.term import TerminalNotifier
-from tools.psa import generate_psa_sources, clean_psa_autogen
-from tools.resources import OsAndSpeResourceFilter
 
 """ The CLI entry point for exporting projects from the mbed tools to any of the
 supported IDEs or project structures.
@@ -380,7 +378,6 @@ def main():
 
         if options.clean:
             clean(options.source_dir)
-            clean_psa_autogen()
 
         ide = resolve_exporter_alias(options.ide)
         exporter, toolchain_name = get_exporter_toolchain(ide)
@@ -390,16 +387,7 @@ def main():
             args_error(parser, "%s not supported by %s" % (mcu, ide))
 
         try:
-            target = Target.get_target(mcu)
-            if target.is_PSA_target:
-                generate_psa_sources(source_dirs=options.source_dir,
-                                     ignore_paths=[]
-                )
-
             resource_filter = None
-            if target.is_PSA_secure_target:
-                resource_filter = OsAndSpeResourceFilter()
-
             export(
                 mcu,
                 ide,

tools/psa/__init__.py

@@ -20,9 +20,6 @@
 
 from tools.resources import FileType
 from tools.settings import ROOT
-from .generate_partition_code import manifests_discovery, generate_spm_code
-
-
 
 def find_secure_image(notify, resources, ns_image_path,
                       configured_s_image_filename, image_type):
@@ -56,24 +53,3 @@ def find_secure_image(notify, resources, ns_image_path,
         raise Exception("Required secure image not found.")
 
     return secure_image
-
-
-def _get_psa_autogen_dir():
-    return os.path.join(ROOT, 'PSA_AUTOGEN')
-
-
-def clean_psa_autogen():
-    psa_out_dir = _get_psa_autogen_dir()
-
-    if os.path.isdir(psa_out_dir):
-        shutil.rmtree(psa_out_dir)
-
-
-def generate_psa_sources(source_dirs, ignore_paths):
-    services, apps = manifests_discovery(root_dirs=source_dirs,
-                                         ignore_paths=ignore_paths + ['.git'])
-    assert len(services + apps), 'PSA manifest discovery failed'
-    psa_out_dir = _get_psa_autogen_dir()
-
-    generate_spm_code(services, apps, psa_out_dir)
-    return psa_out_dir