TF-M: directory structure update proposal to import twincpu branch to mbed-os

.astyleignore

@@ -1,12 +1,11 @@
 ^BUILD
 ^cmsis
 ^components/802.15.4_RF
-^components/TARGET_PSA/services/attestation/attestation.h
-^components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/tfm_impl
-^components/TARGET_PSA/services/attestation/qcbor
-^components/TARGET_PSA/services/crypto/COMPONENT_PSA_SRV_IPC/crypto_struct_ipc.h
-^components/TARGET_PSA/TARGET_TFM
-^components/TARGET_PSA/TESTS
+^features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/attestation.h
+^features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/implementation/tfm_impl
+^features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/qcbor
+^features/FEATURE_PSA/TARGET_TFM
+^features/FEATURE_PSA/TARGET_MBED_PSA_SRV/TESTS
 ^features/cryptocell
 ^features/FEATURE_BLE
 ^features/frameworks

.travis.yml

@@ -195,8 +195,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:
@@ -208,13 +208,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

LICENSE.md

@@ -5,11 +5,11 @@ Folders containing files under different permissive license than Apache 2.0 are
 
 - [cmsis](./cmsis) - MIT, BSD-3-Clause
 - [components/802.15.4_RF/mcr20a-rf-driver](./components/802.15.4_RF/mcr20a-rf-driver) - BSD-3-Clause
-- [components/TARGET_PSA/TARGET_TFM](./components/TARGET_PSA/TARGET_TFM) - BSD-3-Clause
-- [components/TARGET_PSA/TARGET_PSA/services/attestation](./components/TARGET_PSA/services/attestation) - BSD-3-Clause
 - [features/cryptocell/FEATURE_CRYPTOCELL310](./features/cryptocell/FEATURE_CRYPTOCELL310) - ARM Object Code and Header Files License
 - [features/FEATURE_BOOTLOADER](./features/FEATURE_BOOTLOADER) - PBL
 - [features/FEATURE_BLE/targets](./features/FEATURE_BLE/targets) - BSD-style, PBL, MIT-style
+- [features/FEATURE_PSA/FEATURE_TFM](./features/FEATURE_PSA/FEATURE_TFM) - BSD-3-Clause
+- [features/FEATURE_PSA/FEATURE_MBED_PSA_SRV/services/attestation](./features/FEATURE_PSA/FEATURE_MBED_PSA_SRV/services/attestation) - BSD-3-Clause
 - [features/lorawan](./features/lorawan) - Revised BSD
 - [features/lwipstack](./features/lwipstack) - BSD-style, MIT-style
 - [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause

TESTS/mbed-crypto/sanity/main.cpp

@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 
-#include "psa/crypto.h"
-
-#if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
+#if ((!defined(FEATURE_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
 #error [NOT_SUPPORTED] Mbed Crypto is OFF - skipping.
 #else
 
+#include "psa/crypto.h"
 #include <stdio.h>
 #include "mbed.h"
 #include "greentea-client/test_env.h"

TESTS/mbed_hal/trng/main.cpp

@@ -68,7 +68,7 @@
 
 using namespace utest::v1;
 
-#if (defined(TARGET_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
+#if (defined(FEATURE_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
 #include "entropy.h"
 #include "entropy_poll.h"
 #include "crypto.h"
@@ -93,7 +93,7 @@ void inject_entropy_for_psa()
         mbedtls_psa_inject_entropy(seed, MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE);
     }
 }
-#endif // (defined(TARGET_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
+#endif // (defined(FEATURE_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
 
 static int fill_buffer_trng(uint8_t *buffer, trng_t *trng_obj, size_t trng_len)
 {
@@ -274,7 +274,7 @@ int main()
 #if defined(MBEDTLS_PLATFORM_C)
     ret = mbedtls_platform_setup(NULL);
 #endif /* MBEDTLS_PLATFORM_C */
-#if (defined(TARGET_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
+#if (defined(FEATURE_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
     inject_entropy_for_psa();
 #endif
     ret = !Harness::run(specification);

TESTS/mbedtls/selftest/main.cpp

@@ -84,7 +84,7 @@ Case cases[] = {
 #endif /* MBEDTLS_SELF_TEST */
 };
 
-#if (defined(MBEDTLS_ENTROPY_C) && defined(TARGET_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
+#if (defined(MBEDTLS_ENTROPY_C) && defined(FEATURE_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
 #include "crypto.h"
 #if !defined(MAX)
 #define MAX(a,b) (((a)>(b))?(a):(b))
@@ -107,7 +107,7 @@ void inject_entropy_for_psa()
         mbedtls_psa_inject_entropy(seed, MBEDTLS_PSA_INJECT_ENTROPY_MIN_SIZE);
     }
 }
-#endif // (defined(MBEDTLS_ENTROPY_C) && defined(TARGET_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
+#endif // (defined(MBEDTLS_ENTROPY_C) && defined(FEATURE_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
 
 
 utest::v1::status_t test_setup(const size_t num_cases)
@@ -128,7 +128,7 @@ int main()
     }
 #endif
 
-#if (defined(MBEDTLS_ENTROPY_C) && defined(TARGET_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
+#if (defined(MBEDTLS_ENTROPY_C) && defined(FEATURE_PSA) && defined(COMPONENT_PSA_SRV_IPC) && defined(MBEDTLS_PSA_CRYPTO_C))
     inject_entropy_for_psa();
 #endif