From bb775c2e693188bdee61de2baf593d03045b1163 Mon Sep 17 00:00:00 2001 From: Oren Cohen Date: Wed, 6 Feb 2019 13:28:29 +0200 Subject: [PATCH 1/2] Storage mbed_lib.json files --- .../storage/kvstore/conf/global/mbed_lib.json | 30 +++++++++++++++++++ features/storage/kvstore/conf/mbed_lib.json | 29 +----------------- .../direct_access_devicekey/mbed_lib.json | 3 ++ .../kvstore/filesystemstore/mbed_lib.json | 3 ++ .../storage/kvstore/global_api/mbed_lib.json | 3 ++ features/storage/kvstore/kv_map/mbed_lib.json | 3 ++ .../storage/kvstore/tdbstore/mbed_lib.json | 3 ++ 7 files changed, 46 insertions(+), 28 deletions(-) create mode 100644 features/storage/kvstore/conf/global/mbed_lib.json create mode 100644 features/storage/kvstore/direct_access_devicekey/mbed_lib.json create mode 100644 features/storage/kvstore/filesystemstore/mbed_lib.json create mode 100644 features/storage/kvstore/global_api/mbed_lib.json create mode 100644 features/storage/kvstore/kv_map/mbed_lib.json create mode 100644 features/storage/kvstore/tdbstore/mbed_lib.json diff --git a/features/storage/kvstore/conf/global/mbed_lib.json b/features/storage/kvstore/conf/global/mbed_lib.json new file mode 100644 index 00000000000..35938fdaae9 --- /dev/null +++ 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 index 35938fdaae9..55c62752006 100644 --- 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 new file mode 100644 index 00000000000..c98f6f1eb48 --- /dev/null +++ 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 new file mode 100644 index 00000000000..dbcba1eacf8 --- /dev/null +++ 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 new file mode 100644 index 00000000000..7facc6b0dc8 --- /dev/null +++ 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 new file mode 100644 index 00000000000..07dc74cdca4 --- /dev/null +++ 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 new file mode 100644 index 00000000000..9ae5f7a8895 --- /dev/null +++ b/features/storage/kvstore/tdbstore/mbed_lib.json @@ -0,0 +1,3 @@ +{ + "name": "tdbstore" +} From b5e84924582b4ef89f93eb13ee18ddd109a02a23 Mon Sep 17 00:00:00 2001 From: Oren Cohen Date: Wed, 6 Feb 2019 13:31:01 +0200 Subject: [PATCH 2/2] Add PSA mbed-lib.json --- .../services/COMPONENT_PSA_SRV_IMPL/mbed_lib.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 components/TARGET_PSA/services/COMPONENT_PSA_SRV_IMPL/mbed_lib.json 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 new file mode 100644 index 00000000000..9e4db970062 --- /dev/null +++ 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" + ] +}