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

Feature imxrt1064 mcuboot #8684

Merged
merged 1 commit into from
Mar 2, 2023
Merged

Feature imxrt1064 mcuboot #8684

merged 1 commit into from
Mar 2, 2023

Conversation

jturnsek
Copy link
Contributor

@jturnsek jturnsek commented Mar 1, 2023

Summary

MCUboot support for i.MXRT1064-EVK board

Impact

imxrt1064-evk board

Testing

Tested on i.MXRT1064-EVK test board with mcuboot-loader and mcuboot-app configurations.

@acassis
Copy link
Contributor

acassis commented Mar 1, 2023

@jturnsek maybe this #8683 could impact your PR, please rebase and test again

@jturnsek
Copy link
Contributor Author

jturnsek commented Mar 1, 2023

@jturnsek maybe this #8683 could impact your PR, please rebase and test again

I don't think so, because it just adds some macros related to NAND Flash. I will rebase it and test it ASAP.

@xiaoxiang781216
Copy link
Contributor

@jturnsek please remove the merge patch from PR.

@jturnsek
Copy link
Contributor Author

jturnsek commented Mar 1, 2023

@jturnsek please remove the merge patch from PR.

I think I have messed things up. How can I remove merge patch from PR? Thanks.

@xiaoxiang781216
Copy link
Contributor

git remote add apache git@github.com:apache/nuttx.git
git fetch apache/master
git rebase HEAD~4
change pick to squash

@jturnsek jturnsek force-pushed the feature/imxrt_mcuboot branch 2 times, most recently from 1e5350e to 5e04cef Compare March 1, 2023 17:04
@jturnsek
Copy link
Contributor Author

jturnsek commented Mar 1, 2023

@xiaoxiang781216 I have done hard reset to SHA before merge and do a rebase and then force push to my remote repo. Would this be ok?

@xiaoxiang781216
Copy link
Contributor

Since patch 2 and 3 contain many intermediate change, I think it's better to squash into the first patch.

@jturnsek
Copy link
Contributor Author

jturnsek commented Mar 1, 2023

Since patch 2 and 3 contain many intermediate change, I think it's better to squash into the first patch.

This should be it now.

@xiaoxiang781216
Copy link
Contributor

@jturnsek please run:

./tools/refresh.sh --silent imxrt1064-evk/mcuboot-loader
./tools/refresh.sh --silent imxrt1064-evk/mcuboot-app

to ensure the defconfig in normal form

@xiaoxiang781216
Copy link
Contributor

xiaoxiang781216 commented Mar 2, 2023 •
edited
Loading

@jturnsek let's squash into one patch too.

@xiaoxiang781216 xiaoxiang781216 merged commit 081b04f into apache:master Mar 2, 2023
pkarashchenko
pkarashchenko reviewed Mar 2, 2023
View reviewed changes
boards/arm/imxrt/imxrt1064-evk/src/imxrt_progmem.c
* Pre-processor Definitions
****************************************************************************/

#define ARRAYSIZE(x) (sizeof((x)) / sizeof((x)[0]))
Copy link
Contributor

Choose a reason for hiding this comment

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

we already have nitems in sys/params.h. just a notice

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@acassis acassis acassis left review comments

@pkarashchenko pkarashchenko pkarashchenko left review comments

@gustavonihei gustavonihei gustavonihei left review comments

@xiaoxiang781216 xiaoxiang781216 xiaoxiang781216 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jturnsek @acassis @xiaoxiang781216 @pkarashchenko @gustavonihei