cpu/esp8266: Add missing MCU_ESP8266 define for vendor code#20415
Closed
maribu wants to merge 1 commit intoRIOT-OS:masterfrom
Closed
cpu/esp8266: Add missing MCU_ESP8266 define for vendor code#20415maribu wants to merge 1 commit intoRIOT-OS:masterfrom
maribu wants to merge 1 commit intoRIOT-OS:masterfrom
Conversation
github-actions
bot
added
Platform: ESP
benpicco
added
the
CI: ready for build
chrysn
added a commit
to chrysn-pull-requests/RIOT
that referenced
this pull request
Feb 22, 2024
Follow-up-for: RIOT-OS#20397 Closes: RIOT-OS#20409 Closes: RIOT-OS#20415
benpicco
approved these changes
Feb 22, 2024
Contributor
benpicco
left a comment
benpicco
left a comment
There was a problem hiding this comment.
ESP8266 is working again, thank you for figuring this out!
benpicco
added
Type: bug
Member
|
These two files may originally be vendor files, but have been heavily customized, including AIU the addition of the MCU_. I'm not objecting to this fix, but think that #20416 is the approach that leaves less legacy sitting around. Either of you please have a look and either ACK the other one, or just hit the "merge when ready" button again here. |
Member
Author
|
Let's go with #20416 instead. I incorrectly assumed the vendor files were unmodified and just adding the required |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Contribution description
Dropping the
MCUvariable in #20397 resulted in breaking the compilation of the vendor code in a non-obvious way. Adding aCFLAGS += -DMCU_ESP8266specifically to the modules containing the vendor code that need this define fixes the issue.Testing procedure
ESP8266 should boot again
Issues/PRs references
Follow up to #20397
Alternative to #20409