-
Notifications
You must be signed in to change notification settings - Fork 6.7k
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
Change mimxrt1060_evk and mimxrt1050_evk to use variants for qspi/hyperflash instead of revisions #79517
base: main
Are you sure you want to change the base?
Change mimxrt1060_evk and mimxrt1050_evk to use variants for qspi/hyperflash instead of revisions #79517
Conversation
029d7c6
to
e0b7f43
Compare
@@ -4,7 +4,7 @@ | |||
# SPDX-License-Identifier: Apache-2.0 | |||
# | |||
|
|||
identifier: mimxrt1050_evk@qspi | |||
identifier: mimxrt1050_evk_qspi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this would be mimxrt1050_evk/mimxrt1052/qspi
@@ -4,7 +4,7 @@ | |||
# SPDX-License-Identifier: Apache-2.0 | |||
# | |||
|
|||
identifier: mimxrt1060_evk@hyperflash | |||
identifier: mimxrt1060_evk_hyperflash |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as above
e0b7f43
to
295ac05
Compare
295ac05
to
5ffdadc
Compare
5ffdadc
to
4166502
Compare
7a67e9a
to
4e6a46f
Compare
@tejlmand I've updated the PR to add that check, but what I think would be optimal in this case is actually to have a default variant, but it looks like that's not possible. The reason is because for example on the rt1060, the qspi is set up out of box, and to switch to hyperflash requires soldering a board rework |
yes, I know. |
found it: #69264 (comment) seems like that PR also contained a proposal to use variants 😆 |
not atm, no. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved.
Feel free to create an enhancement issue for HWMv2 to allow boards to specify that the base-board is not a valid board / allow the board.yml to define a default variant to use when none is given.
4e6a46f
to
5fb8567
Compare
update: fixed rt1050 board overlay names |
5fb8567
to
b80e35c
Compare
rebased and added documentation of board target strings |
@nordicjm there is some tinycrypt related ci issues blocking this PR but in the meantime can you check if your block was addressed |
CONFIG_GPIO=y | ||
CONFIG_ARM_MPU=y | ||
CONFIG_HW_STACK_PROTECTION=y | ||
CONFIG_PINCTRL=y |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CONFIG_PINCTRL=y |
message(FATAL_ERROR "Please specify a board flash variant for the mimxrt1050_evk:\n" | ||
"mimxrt1050_evk//qspi or mimxrt1050_evk//hyperflash\n") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mimxrt1050_evk/mimxrt1052/qspi
and mimxrt1050_evk/mimxrt1052/hyperflash
@@ -3,10 +3,17 @@ | |||
# | |||
# SPDX-License-Identifier: Apache-2.0 | |||
# | |||
|
|||
if (NOT ("${BOARD_QUALIFIERS}" MATCHES "qspi" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if (NOT ("${BOARD_QUALIFIERS}" MATCHES "qspi" | |
if(NOT ("${BOARD_QUALIFIERS}" MATCHES "qspi" |
No spaces between if and bracket in cmake
@@ -4,13 +4,19 @@ | |||
# SPDX-License-Identifier: Apache-2.0 | |||
# | |||
|
|||
if (NOT ("${BOARD_QUALIFIERS}" MATCHES "qspi" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as above
CONFIG_GPIO=y | ||
CONFIG_ARM_MPU=y | ||
CONFIG_HW_STACK_PROTECTION=y | ||
CONFIG_PINCTRL=y |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as above
message(FATAL_ERROR "Please specify a board flash variant for the mimxrt1060_evk:\n" | ||
"mimxrt1060_evk//qspi or mimxrt1060_evk//hyperflash\n") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as above
Switch from using revisions for hyperflash/qspi to using variants, by popular demand. Signed-off-by: Declan Snyder <[email protected]>
b80e35c
to
492e728
Compare
1d5e1c1
to
93e7d91
Compare
Convert qspi and hyperflash to variants instead of revisions by popular demand. And convert evkb into a revision instead of a different board. Signed-off-by: Declan Snyder <[email protected]>
Info in the release notes about changes to the board identifier of the mimxrt1060_evk and mimxrt1050_evk. Signed-off-by: Declan Snyder <[email protected]>
93e7d91
to
48f7477
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor nit. (better cleaned up in a future PR than rerunning CI again)
board_runner_args(jlink "--loader=BankAddr=0x60000000&Loader=QSPI") | ||
elseif ("${BOARD_REVISION}" STREQUAL "hyperflash") | ||
elseif ("${BOARD_QUALIFIERS}" MATCHES "hyperflash") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
space here should go
Change mimxrt1060_evk and mimxrt1050_evk to use variants for qspi/hyperflash instead of revisions
Also for the mimxrt1060_evk, change evkb to a revision.