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.

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

cpu/esp*: fix linker scripts [backport 2020.10] #15197

Merged
merged 3 commits into from
Oct 13, 2020
Merged

cpu/esp*: fix linker scripts [backport 2020.10] #15197

merged 3 commits into from
Oct 13, 2020

Conversation

leandrolanzieri
Copy link
Contributor

Backport of #15186

Contribution description

esp32 and esp8266 specify some modules' object files on their linker scripts. #14754 changed the compilation of RIOT modules, so archives are not generated anymore. This was causing the wildcards on the linker scripts to not match the object files. This PR fixes this issue by using the folder instead of the archive name.

With these changes esp8266 is working again, and for esp32 I ran the mtd test successfully (#15123).

Testing procedure

  • both platforms should be functional again, it would be good to run the tests on the CI.
  • check in the linker scripts that no more non-existent archives are being referenced.

Issues/PRs references

@leandrolanzieri leandrolanzieri added Area: cpu Area: CPU/MCU ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: run tests If set, CI server will run tests on hardware for the labeled PR CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs Platform: ESP Platform: This PR/issue effects ESP-based platforms Process: release backport Integration Process: The PR is a release backport of a change previously provided to master Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) labels Oct 9, 2020
@leandrolanzieri leandrolanzieri mentioned this pull request Oct 9, 2020
Merged
@leandrolanzieri leandrolanzieri added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: run tests If set, CI server will run tests on hardware for the labeled PR CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs labels Oct 9, 2020
benpicco
benpicco previously approved these changes Oct 11, 2020
View reviewed changes
Copy link
Contributor

@benpicco benpicco left a comment

Choose a reason for hiding this comment

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

same as #15186

@leandrolanzieri leandrolanzieri force-pushed the backport/2020.10/pr/esp/fix_linker_scripts branch from 97dafc6 to c67505b Compare October 12, 2020 15:18
@leandrolanzieri
Copy link
Contributor Author

@benpicco I rebased to resolve conflicts, this needs to be ACKed again it seems :-/

@benpicco benpicco merged commit baf041e into RIOT-OS:2020.10-branch Oct 13, 2020
@leandrolanzieri leandrolanzieri deleted the backport/2020.10/pr/esp/fix_linker_scripts branch February 2, 2021 13:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benpicco benpicco benpicco approved these changes

@aabadie aabadie Awaiting requested review from aabadie aabadie is a code owner

@fjmolinas fjmolinas Awaiting requested review from fjmolinas fjmolinas is a code owner

@gschorcht gschorcht Awaiting requested review from gschorcht gschorcht is a code owner

@MichelRottleuthner MichelRottleuthner Awaiting requested review from MichelRottleuthner MichelRottleuthner is a code owner

@smlng smlng Awaiting requested review from smlng

@bergzand bergzand Awaiting requested review from bergzand

Assignees
No one assigned
Labels
Area: cpu Area: CPU/MCU ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ESP Platform: This PR/issue effects ESP-based platforms Process: release backport Integration Process: The PR is a release backport of a change previously provided to master Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@leandrolanzieri @benpicco