Merge pull request #9361 from yossi2le/yossi_fix_for_tfm

Removing dependency of TDBStore in SystemStorage file and moving some file location - TFM support.
ARMmbed · Jan 17, 2019 · 4f95298 · 4f95298
2 parents d0665c8 + 971e29b
commit 4f95298
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/...vstore/tdbstore/DirectAccessDevicekey.cpp → ...ccess_devicekey/DirectAccessDevicekey.cpp b/...vstore/tdbstore/DirectAccessDevicekey.cpp → ...ccess_devicekey/DirectAccessDevicekey.cpp
diff --git a/.../kvstore/tdbstore/DirectAccessDevicekey.h → ..._access_devicekey/DirectAccessDevicekey.h b/.../kvstore/tdbstore/DirectAccessDevicekey.h → ..._access_devicekey/DirectAccessDevicekey.h
diff --git a/features/storage/kvstore/KVStore.h → features/storage/kvstore/include/KVStore.h b/features/storage/kvstore/KVStore.h → features/storage/kvstore/include/KVStore.h
diff --git a/features/storage/kvstore/tdbstore/TDBStore.cpp b/features/storage/kvstore/tdbstore/TDBStore.cpp
@@ -24,7 +24,10 @@
 #include "mbed_error.h"
 #include "mbed_wait_api.h"
 #include "MbedCRC.h"
+//Bypass the check of NVStore co existance if compiled for TARGET_TFM
+#if !(BYPASS_NVSTORE_CHECK)
 #include "SystemStorage.h"
+#endif
 
 using namespace mbed;
 
@@ -990,13 +993,18 @@ int TDBStore::init()
  goto end;
  }
 
+//Bypass the check of NVStore co existance if compiled for TARGET_TFM
+#if !(BYPASS_NVSTORE_CHECK)
+
  //Check if we are on internal memory && try to set the internal memory for TDBStore use.
  if (strcmp(_bd->get_type(), "FLASHIAP") == 0 &&
  avoid_conflict_nvstore_tdbstore(TDBSTORE) == MBED_ERROR_ALREADY_INITIALIZED) {
 
  MBED_ERROR(MBED_ERROR_ALREADY_INITIALIZED, "TDBStore in internal memory can not be initialize when NVStore is in use");
  }
 
+#endif
+
  _max_keys = initial_max_keys;
 
  ram_table = new ram_table_entry_t[_max_keys];