Skip to content
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.

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

Add microbit_v2 layout #358

Merged
merged 5 commits into from
Jan 18, 2022
Merged

Conversation

alexandruradovici
Copy link
Contributor

@alexandruradovici alexandruradovici commented Jan 15, 2022

The PR adds the microbit_v2 memory layout and modifies flash.sh to (hopefully) work with both versions of libtock.

It also adds themicrobit_v2 board to the Makefile, even tough Makefile uses libtock1.

Copy link
Collaborator

@jrvanwhy jrvanwhy left a comment

Choose a reason for hiding this comment

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

I'm fine with adding libtock2 support to flash.sh, although I am planning to replace flash.sh with a Rust crate in the near future.

runtime/layouts/microbit_v2.ld Outdated Show resolved Hide resolved
runtime/layouts/microbit_v2.ld Outdated Show resolved Hide resolved
@alexandruradovici
Copy link
Contributor Author

I'm fine with adding libtock2 support to flash.sh, although I am planning to replace flash.sh with a Rust crate in the near future.

This temporary fix helps with using cargo run at the moment.

@jrvanwhy
Copy link
Collaborator

bors r+

@bors
Copy link
Contributor

bors bot commented Jan 18, 2022

Build succeeded:

@bors bors bot merged commit 4c7ecb6 into tock:master Jan 18, 2022
hudson-ayers pushed a commit that referenced this pull request Feb 3, 2022
The only major change from upstream that this preserves is customized
external assembly linkage. This should be mostly removed once libtock
switches to using `global_asm!` - now that that will be stabilized.

This CL is a squash merge of the following commits:

28ebb70 Merge #365
a0440ba Merge #370
abff51c Merge #359
85242dc Merge #364
f1bd0d4 Merge #361
b0f8593 Merge #355
4c7ecb6 Merge #358
6f8b512 Merge #356
73cbbde Merge #357
022984f Merge #353
b2e6471 Merge #352
9eb12c0 Merge #351

This was retrieved with the following command:
```
git log ti50-internal/upstream/master --not \
  $(git merge-base --all ti50-internal/upstream/master m/main) \
  --first-parent
```

BUG=None
TEST=ti50/common make build
SOURCE=UPSTREAM(28ebb70)

Change-Id: I0aa1606f407a0b4bcf0c76b62261414903479092
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants