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.

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

decsny
Copy link
Member

@decsny decsny commented Oct 7, 2024

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.

@decsny decsny requested review from nashif, tejlmand and nordicjm October 7, 2024 17:44
@zephyrbot zephyrbot added Release Notes To be mentioned in the release notes platform: NXP NXP labels Oct 7, 2024
@decsny decsny force-pushed the fix/mimxrt10xx_board_variants branch 3 times, most recently from 029d7c6 to e0b7f43 Compare October 7, 2024 22:52
@zephyrbot zephyrbot added area: USB Universal Serial Bus area: Samples Samples labels Oct 7, 2024
@@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0
#

identifier: mimxrt1050_evk@qspi
identifier: mimxrt1050_evk_qspi
Copy link
Collaborator

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
Copy link
Collaborator

Choose a reason for hiding this comment

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

as above

@decsny decsny force-pushed the fix/mimxrt10xx_board_variants branch from e0b7f43 to 295ac05 Compare October 8, 2024 15:25
@decsny decsny force-pushed the fix/mimxrt10xx_board_variants branch from 295ac05 to 5ffdadc Compare October 15, 2024 17:42
@zephyrbot zephyrbot requested a review from anangl October 15, 2024 17:42
@decsny decsny force-pushed the fix/mimxrt10xx_board_variants branch from 5ffdadc to 4166502 Compare October 17, 2024 18:27
@decsny decsny force-pushed the fix/mimxrt10xx_board_variants branch 2 times, most recently from 7a67e9a to 4e6a46f Compare November 21, 2024 23:37
@decsny
Copy link
Member Author

decsny commented Nov 21, 2024

@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

@tejlmand
Copy link
Collaborator

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.
and iirc it was exactly because of this soldering that this board was made as revisions in HWMv1.
Re-soldering the board can be considered akin to another board revision.

@tejlmand
Copy link
Collaborator

found it: #69264 (comment)

seems like that PR also contained a proposal to use variants 😆

@tejlmand
Copy link
Collaborator

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.

not atm, no.

tejlmand
tejlmand previously approved these changes Nov 25, 2024
Copy link
Collaborator

@tejlmand tejlmand left a 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.

@decsny
Copy link
Member Author

decsny commented Nov 26, 2024

update: fixed rt1050 board overlay names

tejlmand
tejlmand previously approved these changes Nov 27, 2024
tmon-nordic
tmon-nordic previously approved these changes Nov 27, 2024
@decsny decsny dismissed stale reviews from tmon-nordic and tejlmand via b80e35c December 2, 2024 14:15
@decsny decsny force-pushed the fix/mimxrt10xx_board_variants branch from 5fb8567 to b80e35c Compare December 2, 2024 14:15
@decsny
Copy link
Member Author

decsny commented Dec 2, 2024

rebased and added documentation of board target strings

@decsny
Copy link
Member Author

decsny commented Dec 9, 2024

@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
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
CONFIG_PINCTRL=y

Comment on lines 9 to 10
message(FATAL_ERROR "Please specify a board flash variant for the mimxrt1050_evk:\n"
"mimxrt1050_evk//qspi or mimxrt1050_evk//hyperflash\n")
Copy link
Collaborator

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"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
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"
Copy link
Collaborator

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
Copy link
Collaborator

Choose a reason for hiding this comment

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

as above

Comment on lines 9 to 10
message(FATAL_ERROR "Please specify a board flash variant for the mimxrt1060_evk:\n"
"mimxrt1060_evk//qspi or mimxrt1060_evk//hyperflash\n")
Copy link
Collaborator

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]>
@decsny decsny force-pushed the fix/mimxrt10xx_board_variants branch from b80e35c to 492e728 Compare December 10, 2024 15:22
@decsny decsny requested a review from nordicjm December 10, 2024 15:22
@decsny decsny force-pushed the fix/mimxrt10xx_board_variants branch 3 times, most recently from 1d5e1c1 to 93e7d91 Compare December 10, 2024 19:30
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]>
@decsny decsny force-pushed the fix/mimxrt10xx_board_variants branch from 93e7d91 to 48f7477 Compare December 10, 2024 20:08
Copy link
Collaborator

@nordicjm nordicjm left a 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")
Copy link
Collaborator

Choose a reason for hiding this comment

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

space here should go

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: I2S area: Samples Samples area: USB Universal Serial Bus platform: NXP NXP Release Notes To be mentioned in the release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants