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

Move FLASH_PAGE_SIZE definition to CPU specific target.h files #12394

Merged
merged 4 commits into from Feb 21, 2023
Merged

Move FLASH_PAGE_SIZE definition to CPU specific target.h files #12394

merged 4 commits into from Feb 21, 2023

Conversation

SteveCEvans
Copy link
Member

@SteveCEvans SteveCEvans commented Feb 20, 2023 •
edited

Part of processor specific partitioning of code.

Merge after #12392

@SteveCEvans SteveCEvans mentioned this pull request Feb 20, 2023
Merged
@haslinghuis haslinghuis added this to the 4.5 milestone Feb 20, 2023
@github-actions

This comment has been minimized.

Sign in to view
@blckmn
Copy link
Member

blckmn commented Feb 20, 2023 •
edited

AUTOMERGE: (FAIL)

  • github identifies PR as mergeable -> FAIL
  • assigned to a milestone -> PASS
  • cooling off period lapsed -> FAIL
  • commit count less or equal to three -> PASS
  • Don't merge label NOT found -> PASS
  • at least one RN: label found -> PASS
  • Tested label found -> FAIL
  • assigned to an approver -> PASS
  • approver count at least three -> PASS

@haslinghuis haslinghuis mentioned this pull request Feb 21, 2023
Merged
@KarateBrot
Copy link
Member

@SteveCEvans rebase needed

@blckmn
Copy link
Member

blckmn commented Feb 21, 2023

@SteveCEvans rebase needed

I think the conflicts are now resolved.

@github-actions
Copy link

Do you want to test this code? Here you have an automated build:
Assets
WARNING: It may be unstable. Use only for testing! See: https://www.youtube.com/watch?v=I1uN9CN30gw for instructions for unified targets!

@blckmn blckmn merged commit 0736da8 into betaflight:master Feb 21, 2023
davidbitton pushed a commit to davidbitton/betaflight that referenced this pull request Feb 5, 2024
@SteveCEvans @blckmn @davidbitton
Move FLASH_PAGE_SIZE definition to CPU specific target.h files (betaf…
5b52935 
…light#12394)

* Never block use of SWD pins

* Split the AT-START-F435 and REVO-AT configs out from AT32F435/target.h

* Move FLASH_PAGE_SIZE definition to CPU specific target.h files

---------

Co-authored-by: J Blackman <blckmn@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@blckmn blckmn blckmn approved these changes

@haslinghuis haslinghuis haslinghuis approved these changes

@KarateBrot KarateBrot KarateBrot approved these changes

Assignees

@SteveCEvans SteveCEvans

Labels
RN: REFACTORING RN: TARGET UPDATE
Projects
Finalizing Firmware 4.5 Release
Status: COMPLETED
Milestone
4.5
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@SteveCEvans @blckmn @KarateBrot @haslinghuis