Merge pull request #12154 from hugueskamba/hk-baremetal-nrf51822-fix

adbridge · web-flow · commit 0d48a26f8295 · 2020-01-24T11:21:25.000Z
NRF51822: Fix baremetal linker error
diff --git a/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/us_ticker.c b/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/us_ticker.c
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#if DEVICE_USTICKER
 #include <stddef.h>
 #include <stdbool.h>
 #include "us_ticker_api.h"
@@ -613,3 +615,4 @@ uint32_t os_tick_val(void) {
         return clock_cycles_by_tick - ((current_counter - next_tick_cc_value) % clock_cycles_by_tick);
     }
 }
+#endif // DEVICE_USTICKER
diff --git a/targets/targets.json b/targets/targets.json
@@ -7223,8 +7223,13 @@
             "SERIAL",
             "SLEEP",
             "SPI",
-            "SPISLAVE"
-        ]
+            "SPISLAVE",
+            "USTICKER"
+        ],
+        "overrides": {
+            "tickless-from-us-ticker"   : true,
+            "boot-stack-size"           : "0x400"
+        }
     },
     "MCU_NRF51_16K_BASE": {
         "inherits": [

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`	`* See the License for the specific language governing permissions and`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*/`
	`16`	`+`
	`17`	`+#if DEVICE_USTICKER`
`16`	`18`	`#include <stddef.h>`
`17`	`19`	`#include <stdbool.h>`
`18`	`20`	`#include "us_ticker_api.h"`
`@@ -613,3 +615,4 @@ uint32_t os_tick_val(void) {`
`613`	`615`	`return clock_cycles_by_tick - ((current_counter - next_tick_cc_value) % clock_cycles_by_tick);`
`614`	`616`	`}`
`615`	`617`	`}`
	`618`	`+#endif // DEVICE_USTICKER`