Merge pull request #9628 from kfnta/bare-metal-updates

Cruz Monrreal · web-flow · commit c07410d78c28 · 2019-02-14T09:13:34.000-06:00
Bare metal mbed_lib updates
diff --git a/components/TARGET_PSA/services/COMPONENT_PSA_SRV_IMPL/mbed_lib.json b/components/TARGET_PSA/services/COMPONENT_PSA_SRV_IMPL/mbed_lib.json
@@ -0,0 +1,13 @@
+{
+    "name": "psa-services",
+    "requires": [
+        "drivers",
+        "platform",
+        "mbedtls",
+        "mbed-crypto",
+        "storage",
+        "flashiap-block-device",
+        "tdbstore",
+        "storage_tdb_internal"
+    ]
+}
diff --git a/features/storage/kvstore/conf/global/mbed_lib.json b/features/storage/kvstore/conf/global/mbed_lib.json
@@ -0,0 +1,30 @@
+{
+"name": "storage",
+    "config": {
+        "storage_type": {
+            "help": "Options are TDB_INTERNAL, TDB_EXTERNAL, TDB_EXTERNAL_NO_RBP, FILESYSTEM, FILESYSTEM_NO_RBP or default. If default, the storage type will be chosen according to the component defined in targets.json",
+            "value": "default"
+        },
+        "default_kv": {
+            "help": "A string name for the default kvstore configuration",
+            "value": "kv"
+        }
+    },
+    "target_overrides": {
+        "FUTURE_SEQUANA_M0_PSA": {
+            "storage_type": "TDB_INTERNAL"
+        },
+        "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/features/storage/kvstore/conf/mbed_lib.json b/features/storage/kvstore/conf/mbed_lib.json
@@ -1,30 +1,3 @@
 {
-"name": "storage",
-    "config": {
-        "storage_type": {
-            "help": "Options are TDB_INTERNAL, TDB_EXTERNAL, TDB_EXTERNAL_NO_RBP, FILESYSTEM, FILESYSTEM_NO_RBP or default. If default, the storage type will be chosen according to the component defined in targets.json",
-            "value": "default"
-        },
-        "default_kv": {
-            "help": "A string name for the default kvstore configuration",
-            "value": "kv"
-        }
-    },
-    "target_overrides": {
-        "FUTURE_SEQUANA_M0_PSA": {
-            "storage_type": "TDB_INTERNAL"
-        },
-        "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"
-        }
-    }
+    "name": "kv-config"
 }
diff --git a/features/storage/kvstore/direct_access_devicekey/mbed_lib.json b/features/storage/kvstore/direct_access_devicekey/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "direct-access-devicekey"
+}
diff --git a/features/storage/kvstore/filesystemstore/mbed_lib.json b/features/storage/kvstore/filesystemstore/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "filesystemstore"
+}
diff --git a/features/storage/kvstore/global_api/mbed_lib.json b/features/storage/kvstore/global_api/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "kv-global-api"
+}
diff --git a/features/storage/kvstore/kv_map/mbed_lib.json b/features/storage/kvstore/kv_map/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "kv-map"
+}
diff --git a/features/storage/kvstore/tdbstore/mbed_lib.json b/features/storage/kvstore/tdbstore/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "tdbstore"
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "name": "direct-access-devicekey"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "name": "filesystemstore"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "name": "kv-global-api"`
	`3`	`+}`