ports/rp2: Use MICROPY_BOARD_DIR to find pins.csv. #13766
Closed
Conversation
This file contains 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
Assuming that ${MICROPY_PORT_DIR}/boards/${MICROPY_BOARD} is
equal to ${MICROPY_BOARD_DIR} is not valid. Replace this path
with the canonical ${MICROPY_BOARD_DIR} so that pins.csv is
correctly located when building against out-of-tree board
definitions.
Additionally remove MICROPY_BOARDS_DIR to discourage similar
mistakes.
Signed-off-by: Phil Howard <phil@gadgetoid.com>
|
Is there anything I can/should test that would help move this along? |
|
Sorry I didn't get to this earlier. This is indeed a proper fix for the issue, and I also like the removal of Rebased and merged in 932f76c |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
It's not valid to assume that
${MICROPY_PORT_DIR}/boards/${MICROPY_BOARD}is equal to${MICROPY_BOARD_DIR}, because the latter could be outside of${MICROPY_PORT_DIR}, eg: https://github.com/pimoroni/badger2040/tree/main/firmware/PIMORONI_BADGER2040WThis PR replaces this path with the canonical
${MICROPY_BOARD_DIR}so thatpins.csvis correctly located when building against out-of-tree board definitions.Additionally I've removed
MICROPY_BOARDS_DIRto discourage similar mistakes.This bug caused
pins.csvin our out-of-tree board definitions for Badger 2040W to not be detected- pimoroni/badger2040#60