Merge pull request #12166 from hugueskamba/hk-baremetal-NRF52840_DK-fix

0xc0170 · web-flow · commit a8188bfd4d25 · 2020-02-14T08:21:27.000Z
NRF52840_DK: Fix baremetal linker error
diff --git a/TESTS/configs/baremetal.json b/TESTS/configs/baremetal.json
@@ -32,7 +32,8 @@
         "events",
         "kv-global-api",
         "sd",
-        "qspif"
+        "qspif",
+        "cryptocell310"
     ],
     "target_overrides": {
         "*": {
diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/mbed_lib.json b/features/cryptocell/FEATURE_CRYPTOCELL310/mbed_lib.json
@@ -0,0 +1,6 @@
+{
+    "name": "cryptocell310",
+    "config": {
+        "present": 1
+  }
+}
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/objects.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/objects.h
@@ -54,7 +54,7 @@ extern "C" {
 
 #include "nrf_uarte.h"
 
-#if defined(FEATURE_CRYPTOCELL310)
+#if MBED_CONF_CRYPTOCELL310_PRESENT
 #include "objects_cryptocell.h"
 #else
 struct trng_s {
