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

NRF51822: Fix baremetal linker error
pull/12324/head
Anna Bridge 2020-01-24 11:21:25 +00:00 committed by GitHub
commit 0d48a26f82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions

View File

@ -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

View File

@ -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": [