Skip to content

sys/riotboot: uncrustify#15956

Merged
kaspar030 merged 1 commit intoRIOT-OS:masterfrom
fjmolinas:pr_riotboot_uncrustify
Feb 9, 2021
Merged

sys/riotboot: uncrustify#15956
kaspar030 merged 1 commit intoRIOT-OS:masterfrom
fjmolinas:pr_riotboot_uncrustify

Conversation

@fjmolinas
Copy link
Contributor

Contribution description

While looking at #15912 I realized riotboot files were full of uncrustify issues. To ease reviewing I prefered to split uncrustify changes out and add it to the whitelist.

Testing procedure

  • green Murdock
  • binaries should not have changed

Issues/PRs references

Waiting for #15912

@fjmolinas fjmolinas added Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation State: waiting for other PR State: The PR requires another PR to be merged first Area: OTA Area: Over-the-air updates labels Feb 9, 2021
#define FLASHPAGE_SIZE (128U)
#endif

#if defined(CPU_FAM_STM32L0) || defined(CPU_FAM_STM32L1) || \
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this PR still includes the other commits.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It does. that is why its waiting for the other PR, since it will have a conflict anyway

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah I understood what you meant, that happened in the original PR, so they are removed now. Thanks for pointing this out.

@fjmolinas fjmolinas force-pushed the pr_riotboot_uncrustify branch from 9c91ec8 to 6a79d94 Compare February 9, 2021 12:38
@fjmolinas fjmolinas added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed State: waiting for other PR State: The PR requires another PR to be merged first labels Feb 9, 2021
@fjmolinas
Copy link
Contributor Author

All green here @kaspar030

Copy link
Contributor

@kaspar030 kaspar030 left a comment

Choose a reason for hiding this comment

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

ACK.

@kaspar030 kaspar030 merged commit 807b154 into RIOT-OS:master Feb 9, 2021
@kaspar030 kaspar030 added this to the Release 2021.04 milestone Apr 23, 2021
@fjmolinas fjmolinas deleted the pr_riotboot_uncrustify branch July 30, 2021 11:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: OTA Area: Over-the-air updates CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants