Don't enable Device Key, if KVStore is not configured

Author: Seppo Takalo

features/device_key/source/DeviceKey.h

@@ -20,12 +20,12 @@
 #include "stdint.h"
 #include "platform/NonCopyable.h"
 
-#define DEVICEKEY_ENABLED 1
-
 // Whole class is not supported if entropy is not enabled
 // Flash device is required as Device Key is currently depending on it
-#if !DEVICE_FLASH || !defined(COMPONENT_FLASHIAP)
-#undef DEVICEKEY_ENABLED
+// and KVStore needs to be configured properly, as Device key lives inside it
+#if DEVICE_FLASH && defined(COMPONENT_FLASHIAP) && MBED_CONF_STORAGE_TDB_INTERNAL_INTERNAL_SIZE
+#define DEVICEKEY_ENABLED 1
+#else
 #define DEVICEKEY_ENABLED 0
 #endif
 

features/storage/TESTS/kvstore/direct_access_devicekey_test/main.cpp

@@ -15,10 +15,6 @@
 * limitations under the License.
 */
 
-#ifndef COMPONENT_FLASHIAP
-#error [NOT_SUPPORTED] Target must have internal FlashIAP for this test
-#else
-
 #include "mbed.h"
 #include <stdio.h>
 #include <string.h>
@@ -35,6 +31,10 @@
 #include "utest.h"
 #include <stdlib.h>
 
+#if !defined(COMPONENT_FLASHIAP) || !DEVICEKEY_ENABLED
+#error [NOT_SUPPORTED] Target must have internal FlashIAP and Device Key configured for this test
+#else
+
 using namespace utest::v1;
 using namespace mbed;