Merge pull request #9195 from alzix/patch-1

0xc0170 · web-flow · commit 58a6c24f6b51 · 2019-01-14T08:40:06.000Z
Enable PSA APIs on Pelion boards
diff --git a/TESTS/psa/entropy_inject/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp b/TESTS/psa/entropy_inject/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp
@@ -42,7 +42,7 @@ psa_its_status_t test_psa_its_reset_impl(void)
     }
 
     KVMap &kv_map = KVMap::get_instance();
-    KVStore *kvstore = kv_map.get_main_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
+    KVStore *kvstore = kv_map.get_internal_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
     if (!kvstore) {
         return PSA_ITS_ERROR_STORAGE_FAILURE;
     }
diff --git a/TESTS/psa/entropy_inject/its_reset/COMPONENT_SPE/test_pits_impl.cpp b/TESTS/psa/entropy_inject/its_reset/COMPONENT_SPE/test_pits_impl.cpp
@@ -42,7 +42,7 @@ psa_its_status_t test_psa_its_reset_impl(void)
     }
 
     KVMap &kv_map = KVMap::get_instance();
-    KVStore *kvstore = kv_map.get_main_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
+    KVStore *kvstore = kv_map.get_internal_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
     if (!kvstore) {
         return PSA_ITS_ERROR_STORAGE_FAILURE;
     }
diff --git a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_PSA_SRV_IMPL/test_pits_impl.cpp
@@ -42,7 +42,7 @@ psa_its_status_t test_psa_its_reset_impl(void)
     }
 
     KVMap &kv_map = KVMap::get_instance();
-    KVStore *kvstore = kv_map.get_main_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
+    KVStore *kvstore = kv_map.get_internal_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
     if (!kvstore) {
         return PSA_ITS_ERROR_STORAGE_FAILURE;
     }
diff --git a/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/test_pits_impl.cpp b/TESTS/psa/prot_internal_storage/its_reset/COMPONENT_SPE/test_pits_impl.cpp
@@ -42,7 +42,7 @@ psa_its_status_t test_psa_its_reset_impl(void)
     }
 
     KVMap &kv_map = KVMap::get_instance();
-    KVStore *kvstore = kv_map.get_main_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
+    KVStore *kvstore = kv_map.get_internal_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));
     if (!kvstore) {
         return PSA_ITS_ERROR_STORAGE_FAILURE;
     }
diff --git a/features/storage/kvstore/conf/mbed_lib.json b/features/storage/kvstore/conf/mbed_lib.json
@@ -16,6 +16,15 @@
         },
         "K66F": {
             "storage_type": "TDB_INTERNAL"
+        },
+        "NUCLEO_F411RE": {
+            "storage_type": "TDB_INTERNAL"
+        },
+        "NUCLEO_F429ZI": {
+            "storage_type": "TDB_INTERNAL"
+        },
+        "UBLOX_EVK_ODIN_W2": {
+            "storage_type": "TDB_INTERNAL"
         }
     }
 }
diff --git a/targets/targets.json b/targets/targets.json
@@ -1735,7 +1735,8 @@
             "MCUXpresso_MCUS",
             "KSDK2_MCUS",
             "FRDM",
-            "Freescale_EMAC"
+            "Freescale_EMAC",
+            "PSA"
         ],
         "is_disk_virtual": true,
         "macros": ["CPU_MK66FN2M0VMD18", "FSL_RTOS_MBED"],
@@ -2399,7 +2400,8 @@
         "inherits": ["FAMILY_STM32"],
         "supported_form_factors": ["ARDUINO", "MORPHO"],
         "core": "Cortex-M4F",
-        "extra_labels_add": ["STM32F4", "STM32F411xE", "STM32F411RE"],
+        "extra_labels_add": ["STM32F4", "STM32F411xE", "STM32F411RE", "PSA"],
+        "components_add": ["FLASHIAP"],
         "detect_code": ["0740"],
         "config": {
             "clock_source": {
@@ -2656,8 +2658,10 @@
             "STM32F429ZI",
             "STM32F429xx",
             "STM32F429xI",
-            "STM_EMAC"
+            "STM_EMAC",
+            "PSA"
         ],
+        "components_add": ["FLASHIAP"],
         "macros_add": [
             "USB_STM_HAL",
             "USBHOST_OTHER"
@@ -4178,6 +4182,8 @@
         "supported_form_factors": ["ARDUINO"],
         "release_versions": ["5"],
         "device_has_remove": [],
+        "extra_labels_add": ["PSA"],
+        "components_add": ["FLASHIAP"],
         "config": {
             "stdio_uart_tx_help": {
                 "help": "Value: D8(default) or D1"

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ psa_its_status_t test_psa_its_reset_impl(void)`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`KVMap &kv_map = KVMap::get_instance();`
`45`		`- KVStore *kvstore = kv_map.get_main_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));`
	`45`	`+ KVStore *kvstore = kv_map.get_internal_kv_instance(STR_EXPAND(MBED_CONF_STORAGE_DEFAULT_KV));`
`46`	`46`	`if (!kvstore) {`
`47`	`47`	`return PSA_ITS_ERROR_STORAGE_FAILURE;`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,15 @@`
`16`	`16`	`},`
`17`	`17`	`"K66F": {`
`18`	`18`	`"storage_type": "TDB_INTERNAL"`
	`19`	`+ },`
	`20`	`+ "NUCLEO_F411RE": {`
	`21`	`+ "storage_type": "TDB_INTERNAL"`
	`22`	`+ },`
	`23`	`+ "NUCLEO_F429ZI": {`
	`24`	`+ "storage_type": "TDB_INTERNAL"`
	`25`	`+ },`
	`26`	`+ "UBLOX_EVK_ODIN_W2": {`
	`27`	`+ "storage_type": "TDB_INTERNAL"`
`19`	`28`	`}`
`20`	`29`	`}`
`21`	`30`	`}`