From ce9fa065db6b3a2e16b001e2014ad2af4279c8ea Mon Sep 17 00:00:00 2001
From: Alexander Zilberkant <alexander.zilberkant@arm.com>
Date: Wed, 26 Dec 2018 13:32:54 +0200
Subject: [PATCH] Enable entropy injection on PSA targets

enable entropy injection on:
- K64F
- K66F
- NUCLEO_F411RE
- NUCLEO_F429ZI
- UBLOX_EVK_ODIN_W2
---
 targets/targets.json | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/targets/targets.json b/targets/targets.json
index 6989f412e5..93739099b6 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -1451,7 +1451,14 @@
             "PSA"
         ],
         "is_disk_virtual": true,
-        "macros": ["CPU_MK64FN1M0VMD12", "FSL_RTOS_MBED", "MBEDTLS_PSA_CRYPTO_C"],
+        "macros": [
+            "CPU_MK64FN1M0VMD12",
+            "FSL_RTOS_MBED",
+            "MBEDTLS_PSA_CRYPTO_C",
+            "MBEDTLS_ENTROPY_NV_SEED",
+            "MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
+            "MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
+        ],
         "inherits": ["Target"],
         "detect_code": ["0240"],
         "device_has": [
@@ -1739,7 +1746,14 @@
             "PSA"
         ],
         "is_disk_virtual": true,
-        "macros": ["CPU_MK66FN2M0VMD18", "FSL_RTOS_MBED"],
+        "macros": [
+            "CPU_MK66FN2M0VMD18", 
+            "FSL_RTOS_MBED", 
+            "MBEDTLS_PSA_CRYPTO_C",
+            "MBEDTLS_ENTROPY_NV_SEED",
+            "MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
+            "MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
+        ],
         "inherits": ["Target"],
         "detect_code": ["0311"],
         "device_has": [
@@ -2415,7 +2429,14 @@
                 "macro_name": "CLOCK_SOURCE_USB"
             }
         },
-        "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
+        "macros_add": [
+            "USB_STM_HAL", 
+            "USBHOST_OTHER", 
+            "MBEDTLS_PSA_CRYPTO_C",
+            "MBEDTLS_ENTROPY_NV_SEED",
+            "MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
+            "MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
+        ],
         "device_has_add": ["SERIAL_ASYNCH", "SERIAL_FC", "FLASH", "MPU"],
         "release_versions": ["2", "5"],
         "device_name": "STM32F411RE",
@@ -2664,7 +2685,11 @@
         "components_add": ["FLASHIAP"],
         "macros_add": [
             "USB_STM_HAL",
-            "USBHOST_OTHER"
+            "USBHOST_OTHER",
+            "MBEDTLS_PSA_CRYPTO_C",
+            "MBEDTLS_ENTROPY_NV_SEED",
+            "MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
+            "MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
         ],
         "device_has_add": [
             "ANALOGOUT",
@@ -4184,6 +4209,12 @@
         "device_has_remove": [],
         "extra_labels_add": ["PSA"],
         "components_add": ["FLASHIAP"],
+        "macros_add": [
+            "MBEDTLS_PSA_CRYPTO_C",
+            "MBEDTLS_ENTROPY_NV_SEED",
+            "MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
+            "MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
+        ],
         "config": {
             "stdio_uart_tx_help": {
                 "help": "Value: D8(default) or D1"