Skip to content

NRF51822: Fix baremetal linker error #12154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 24, 2020
Merged

NRF51822: Fix baremetal linker error #12154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions targets/TARGET_NORDIC/TARGET_MCU_NRF51822/us_ticker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
9 changes: 7 additions & 2 deletions targets/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5043,8 +5043,13 @@
"SERIAL",
"SLEEP",
"SPI",
"SPISLAVE"
]
"SPISLAVE",
"USTICKER"
],
"overrides": {
"tickless-from-us-ticker" : true,
"boot-stack-size" : "0x400"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we also change boot-stack-size in this PR which addresses a baremetal link error?
I am assuming that there is not enough memory on this target to accommodate the default 4K stack size?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#12155 (comment)
#12134 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know why we also need to change the boot stack size nor which value it should be set to: 0x800 or 0x400:
https://github.com/ARMmbed/mbed-os/blob/master/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/device/TOOLCHAIN_GCC_ARM/TARGET_MCU_NORDIC_32K/NRF51822.ld/#L4

https://github.com/ARMmbed/mbed-os/blob/master/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/device/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_32K/nRF51822_QFAA.icf/#L7

@mprse You worked on this some time ago, can you give your view?

}
},
"MCU_NRF51_16K_BASE": {
"inherits": ["MCU_NRF51"],
Expand Down