Thanks to visit codestin.com
Credit goes to github.com

Skip to content

boards/Makefile: remove relative libtock-c path assumptions #2585

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

Jump to bottom
Merged
merged 4 commits into from
Jun 12, 2021
Merged

boards/Makefile: remove relative libtock-c path assumptions #2585

merged 4 commits into from
Jun 12, 2021

Conversation

lschuermann
Copy link
Member

@lschuermann lschuermann commented May 17, 2021 •
edited
Loading

Pull Request Overview

Removes any assumptions about application TBFs or libtock-c trees using relative paths outside of the Tock repository. In the cases where Tockloader is not supported (yet), the TBF file to include should be passed using the APP variable instead, as done in clue_nrf52840.

Testing Strategy

This pull request was tested by running make targets.

TODO or Help Wanted

N/A

Documentation Updated

  • Updated the relevant files in /docs, or no updates are required.

Formatting

  • Ran make prepush.

@lschuermann
teensy40/Makefile: don't assume relative libtock-c path for app-tbf
1532dfa 
Don't assume a particular relative path to the libtock-c installation
to look for TBFs (compiled application). Instead, when programming a
kernel together with one or more applications, pass the path to the
TBF applications file in the APP variable.

Furthermore, these changes will cause the combined kernel+application
binary to be rebuilt even if the kernel binary does not change,
whereas previously the `app.elf` file was only dependant on the kernel
elf.

Lastly, the filename of all generated files is prefixed with the
platform name, which is important to avoid collisions in the target
directory.

Signed-off-by: Leon Schuermann <[email protected]>
@lschuermann
microbit_v2/Makefile: remove unused variables
3e44bf6 
Signed-off-by: Leon Schuermann <[email protected]>
@hudson-ayers
Copy link
Contributor

Looks good, look forward to the remaining change

@lschuermann lschuermann mentioned this pull request May 28, 2021
Merged
9 tasks
@lschuermann
Copy link
Member Author

To give an update why this has been pending for so long: I'm not really confident to make these changes to the imxrt1050-evkb board without testing it first (for instance, will the tools still work if there's an elf extension instead of axf, etc.?). Unfortunately NXP's user experience for downloading their MCUXpresso software is entirely broken, and after what have been at least 15 attempts I've managed to start a download with 150kbit/s of a 800MB file. I'll try to have it done by tomorrow.

@lschuermann
imxrt1050-evkb/Makefile: remove path assumptions & refactor
fc6c486 
Removes assumptions about relative libtock-c paths in the
imxrt1050-evkb's Makefile. Furthermore, it fixes some path
assumptions to a macOS-based MCUXpresso installation and uses
proper target names (e.g. not program for compiling, flash for
actually flashing). It removes the debug targets from the
Makefile, in accordance with other boards in upstream Tock.

Signed-off-by: Leon Schuermann <[email protected]>
@lschuermann
imxrt1050-evkb: update README flashing instructions
03988df 
To accomodate changes to the Makefile and flashing targets, this
updates the README to guide users to the correct make targets.

Signed-off-by: Leon Schuermann <[email protected]>
@lschuermann lschuermann marked this pull request as ready for review June 7, 2021 21:34
@lschuermann
Copy link
Member Author

I couldn't test the actual flashing process on the imxrt1050-evkb unfortunately as I have a slightly different chip than the one supported here, but I did manage to get NXP's flashing tool to complain about the chip and not the input file, so I'm positive these changes should work. Updated the documentation accordingly.

@phil-levis
Copy link
Contributor

bors r+

@bors bors bot merged commit 8bf3a98 into tock:master Jun 12, 2021
@bors
Copy link
Contributor

bors bot commented Jun 12, 2021

Build succeeded:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hudson-ayers hudson-ayers hudson-ayers approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lschuermann @hudson-ayers @phil-levis