Fix build of CYTFM_064B0S2_4343W (#364)

* Fix build of CYTFM_064B0S2_4343W

* Fix docstring

Author: Jamie Smith

.github/workflows/test_building_multiple_executables.yml

@@ -11,7 +11,9 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install Python packages
+        # Note: pip>=20.3 is needed to install dependencies of cysecuretools
         run: |
+          python3 -m pip install --upgrade pip
           python3 -m pip install -r tools/requirements.txt
 
       # Note: For this CI job we use MBED_CREATE_PYTHON_VENV=FALSE so that we can make sure

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYTFM_064B0S2_4343W/CMakeLists.txt

@@ -58,6 +58,7 @@ target_link_libraries(mbed-cytfm-064b0s2-4343w
         mbed-cytfm-064b0s2-4343w-cm4
         mbed-cytfm-064b0s2-4343w-bsp-design-modus
         mbed-psoc6
+        mbed-psa
 )
 
 target_compile_definitions(mbed-cytfm-064b0s2-4343w
@@ -70,7 +71,6 @@ target_compile_definitions(mbed-cytfm-064b0s2-4343w
 )
 
 mbed_post_build_psoc6_sign_image(
-    "tfm_s.hex"
     "CYTFM_064B0S2_4343W"
     "policy_multi_CM0_CM4_tfm.json"
     "multi_image"

targets/TARGET_Cypress/scripts/PSOC6.py

@@ -173,18 +173,18 @@ def sign_image(toolchain, resourses, elf, binf, m0hex):
         toolchain.target.cm4_img_id,
         elf,
         binf,
-        m0hexf
+        m0hex
     )
 
 def sign_hex(
-    build_dir, m0hex_filename, target_name, policy, notification, boot_scheme,
+    build_dir, m0hex_signed_intermediate, target_name, policy, notification, boot_scheme,
     cm0_img_id, cm4_img_id, elf, m4hex, m0hex
 ):
     """
     Adds signature to a binary file being built,
     using cysecuretools python package.
     :param build_dir: The build directory
-    :param m0hex_filename: The file name of the Cortex-M0 hex
+    :param m0hex_signed_intermediate: Path to store intermediate signed CM0 hex file at
     :param target_name: The name of the Mbed target
     :param policy: The path to the policy file
     :param notification: The object to output notification with
@@ -199,9 +199,8 @@ def sign_hex(
     # that need to be signed
 
     if m0hex != '':
-        m0hex_build = os.path.join(build_dir, m0hex_filename)
-        copy2(m0hex, m0hex_build)
-        m0hex = m0hex_build
+        copy2(m0hex, m0hex_signed_intermediate)
+        m0hex = m0hex_signed_intermediate
 
     # Mapping from mbed target to cysecuretools target
     TARGET_MAPPING = {
@@ -327,7 +326,7 @@ def sign_action(args):
     """Entry point for the "sign" CLI command."""
     sign_hex(
         args.build_dir,
-        args.m0hex_filename,
+        args.m0hex_signed_intermediate,
         args.target_name,
         args.policy_file_name,
         logging.getLogger(__name__),
@@ -369,7 +368,7 @@ def parse_args():
         "--build-dir", required=True, help="the build directory."
     )
     sign_subcommand.add_argument(
-        "--m0hex-filename", required=True, help="the name of the HEX file."
+        "--m0hex-signed-intermediate", required=True, help="Path to store intermediate signed CM0 hex file at."
     )
     sign_subcommand.add_argument(
         "--target-name", help="the Mbed target name."

targets/TARGET_Cypress/scripts/mbed_set_post_build_cypress.cmake

@@ -54,7 +54,6 @@ endmacro()
 # Sign a Cortex-M4 HEX with Cortex-M0 HEX.
 #
 macro(mbed_post_build_psoc6_sign_image
-    m0hex_filename
     cypress_psoc6_target
     policy_file_name
     boot_scheme
@@ -70,7 +69,7 @@ macro(mbed_post_build_psoc6_sign_image
                 ${Python3_EXECUTABLE} ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/PSOC6.py
                 sign
                 --build-dir ${CMAKE_BINARY_DIR}
-                --m0hex-filename ${m0hex_filename}
+                --m0hex-signed-intermediate $<TARGET_FILE_DIR:${target}>/$<TARGET_FILE_BASE_NAME:${target}>.cm0-signed-image.hex
                 --target-name ${cypress_psoc6_target}
                 --policy-file-name ${policy_file_name}
                 --boot-scheme ${boot_scheme}

tools/requirements.txt

@@ -33,6 +33,7 @@ lxml; sys_platform == 'darwin'
 # needed for signing secure images
 cryptography
 cbor
+cysecuretools~=6.0
 
 # Needed for downloading CMSIS MCU descriptions
 cmsis-pack-manager~=0.5.0