psa: Remove PSA secure binary building tools

The PSA-implementing secure binary is not built using Mbed OS build
tools anymore. Instead, the TrustedFirmware-M (TF-M) build system is
used to produce the secure binary. As such, we remove PSA related hooks
from the build system, remove PSA related scripts from tools/test
folder, and also remove the psa-autogen job from travis which was
running the now unecessary and removed generate_partition_code.py.

Remove the ability to generate new PSA binaries in the old manner, where
Mbed OS implements PSA. We don't yet remove any PSA binaries or break
the currently checked-in Mbed-implemented PSA support. PSA targets
integrated in the old manner will continue working at this point.

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

Author: urutva

.gitignore

@@ -97,6 +97,3 @@ test_suite.json
 
 # default delivery dir
 DELIVERY/
-
-# Directory hosting PSA autogenerated source files
-PSA_AUTOGEN/

.travis.yml

@@ -226,8 +226,8 @@ matrix:
     ### Extended Tests ###
     - &extended-vm
       stage: "Extended"
-      name: "psa autogen"
-      env: NAME=psa-autogen
+      name: "events"
+      env: NAME=events EVENTS=events
       language: python
       python: 3.7
       install:
@@ -239,13 +239,6 @@ matrix:
         - python -m pip install --upgrade setuptools==40.4.3
         - pip install -r requirements.txt
         - pip list --verbose
-      script:
-        - python tools/psa/generate_partition_code.py
-        - git diff --exit-code
-    
-    - <<: *extended-vm
-      name: "events"
-      env: NAME=events EVENTS=events
       script:
         # Check that example compiles
         - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' ${EVENTS}/README.md > main.cpp

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
-from tools.resources import OsAndSpeResourceFilter
 
 def main():
     start = time()
@@ -189,12 +187,6 @@ def main():
 
                     if options.source_dir:
                         resource_filter = None
-                        if target.is_PSA_secure_target:
-                            generate_psa_sources(
-                                source_dirs=options.source_dir,
-                                ignore_paths=[options.build_dir]
-                            )
-                            resource_filter = OsAndSpeResourceFilter()
 
                         lib_build_res = build_library(
                             options.source_dir, options.build_dir, target, toolchain_name,

tools/build_api.py

@@ -42,7 +42,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
@@ -422,7 +422,6 @@ def get_mbed_official_release(version):
             ) for target in TARGET_NAMES \
             if (hasattr(TARGET_MAP[target], 'release_versions')
                 and version in TARGET_MAP[target].release_versions)
-                and not Target.get_target(target).is_PSA_secure_target
         )
     )
 
@@ -624,11 +623,7 @@ def build_project(src_paths, build_path, target, toolchain_name,
         into_dir, extra_artifacts = toolchain.config.deliver_into()
         if into_dir:
             copy_when_different(res[0], into_dir)
-            if not extra_artifacts:
-                if toolchain.target.is_TrustZone_secure_target:
-                    cmse_lib = join(dirname(res[0]), "cmse_lib.o")
-                    copy_when_different(cmse_lib, into_dir)
-            else:
+            if extra_artifacts:
                 for tc, art in extra_artifacts:
                     if toolchain_name == tc:
                         copy_when_different(join(build_path, art), into_dir)
@@ -774,7 +769,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/config/__init__.py

@@ -706,25 +706,14 @@ def _get_primary_memory_override(self, memory_type):
             )
         if hasattr(self.target, "mbed_{}_size".format(memory_type)):
             mem_size = getattr(self.target, "mbed_{}_size".format(memory_type))
-        if (
-            self.target.is_PSA_non_secure_target or
-            self.target.is_PSA_secure_target
-        ):
+        if self.target.is_PSA_non_secure_target:
             config, _ = self.get_config_data()
-            if self.target.is_PSA_secure_target:
-                mem_start = config.get(
-                    "target.secure-{}-start".format(memory_type), mem_start
-                ).value
-                mem_size = config.get(
-                    "target.secure-{}-size".format(memory_type), mem_size
-                ).value
-            elif self.target.is_PSA_non_secure_target:
-                mem_start = config.get(
-                    "target.non-secure-{}-start".format(memory_type), mem_start
-                ).value
-                mem_size = config.get(
-                    "target.non-secure-{}-size".format(memory_type), mem_size
-                ).value
+            mem_start = config.get(
+                "target.non-secure-{}-start".format(memory_type), mem_start
+            ).value
+            mem_size = config.get(
+                "target.non-secure-{}-size".format(memory_type), mem_size
+            ).value
         if mem_start and not isinstance(mem_start, int):
             mem_start = int(mem_start, 0)
         if mem_size and not isinstance(mem_size, int):

tools/importer/tfm_importer.json

@@ -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
-from tools.resources import OsAndSpeResourceFilter
 
 def default_args_dict(options):
     return dict(
@@ -336,13 +334,6 @@ def main():
 
         if options.source_dir is not None:
             resource_filter = None
-            if target.is_PSA_secure_target:
-                generate_psa_sources(
-                    source_dirs=options.source_dir,
-                    ignore_paths=[options.build_dir]
-                )
-                resource_filter = OsAndSpeResourceFilter()
-
             wrapped_build_project(
                 options.source_dir,
                 options.build_dir,

tools/make.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
-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.
@@ -389,14 +387,7 @@ def main():
             args_error(parser, "%s not supported by %s" % (mcu, ide))
 
         try:
-            target = Target.get_target(mcu)
             resource_filter = None
-            if target.is_PSA_secure_target:
-                generate_psa_sources(source_dirs=options.source_dir,
-                                     ignore_paths=[]
-                )
-                resource_filter = OsAndSpeResourceFilter()
-
             export(
                 mcu,
                 ide,

tools/project.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2019 ARM Limited
 #
 # SPDX-License-Identifier: Apache-2.0
@@ -16,13 +16,7 @@
 # limitations under the License.
 
 import os
-import shutil
-
 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,12 +50,3 @@ def find_secure_image(notify, resources, ns_image_path,
         raise Exception("Required secure image not found.")
 
     return secure_image
-
-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 = os.path.join(ROOT, 'components', 'TARGET_PSA')
-
-    generate_spm_code(services, apps, psa_out_dir)
-    return psa_out_dir