From d6863d89e7275422aa3b711c1bffbfb792acf915 Mon Sep 17 00:00:00 2001
From: Oren Cohen <oren.cohen@arm.com>
Date: Sun, 10 Mar 2019 16:16:53 +0200
Subject: [PATCH] PSoC 6 Correct TRNG behaviour

* Remove NVSEED from M0_PSA
* Disable TRNG support for PSA M4
---
 targets/TARGET_Cypress/TARGET_PSOC6/trng_api.c | 3 +++
 targets/targets.json                           | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/trng_api.c b/targets/TARGET_Cypress/TARGET_PSOC6/trng_api.c
index 92f751670d4..a5f37479c36 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/trng_api.c
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/trng_api.c
@@ -19,6 +19,8 @@
 
 #if DEVICE_TRNG
 
+#if !(defined(TARGET_PSA) && defined(COMPONENT_NSPE))
+
 #include "trng_api.h"
 #include "psoc6_utils.h"
 #include "cy_crypto_core_trng.h"
@@ -70,4 +72,5 @@ int trng_get_bytes(trng_t *obj, uint8_t *output, size_t length, size_t *output_l
     return (ret);
 }
 
+#endif // #if !(defined(TARGET_PSA) && defined(COMPONENT_NSPE))
 #endif
diff --git a/targets/targets.json b/targets/targets.json
index 33a0bace94a..9d3d39efe79 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -8042,7 +8042,6 @@
             "MBED_TICKLESS",
             "MBEDTLS_PSA_CRYPTO_SPM",
             "MBEDTLS_PSA_CRYPTO_C",
-            "MBEDTLS_ENTROPY_NV_SEED",
             "CY_IPC_DEFAULT_CFG_DISABLE",
             "PU_ENABLE"
         ],
@@ -8067,7 +8066,7 @@
         "inherits": ["NSPE_Target", "CY8CKIT_062_WIFI_BT"],
         "extra_labels_add": ["PSA", "MBED_SPM"],
         "components_add": ["SPM_MAILBOX", "FLASHIAP"],
-        "device_has_remove": ["TRNG", "CRC"],
+        "device_has_remove": ["CRC"],
         "macros_add": ["MBEDTLS_PSA_CRYPTO_C"],
         "hex_filename": "psa_release_1.0.hex",
         "overrides": {