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

NCS 2.7.0 rebase #1873

Merged
merged 0 commits into from
Jul 3, 2024
Merged

NCS 2.7.0 rebase #1873

merged 0 commits into from
Jul 3, 2024

Conversation

anangl
Copy link
Contributor

@anangl anangl commented Jul 1, 2024

All noup commits have been moved to the top of the branch so that they are applied after all the fromtree and fromlist commits. This operation required the following two commits to be corrected during cherry-picking:

  • 90f792f ("[nrf fromlist] boards: nordic: nrf54l15pdk: Disable asserts on flpr") was modified to not depend on noup changes from 8217fd3 ("[nrf noup] boards: add nrf54l15/nrf54l15/cpuapp/ns as board variant")
  • b613931 ("[nrf noup] boards: nordic: nrf54h20dk: Add aliases for RESETINFO") was turned into a fromtree commit (f86af85) to prevent a conflict in 49d3236 ("[nrf fromtree] boards: nordic: Add PWM support for LEDs on nRF54 DKs")

Squashed noup commits:

  • [nrf noup] ci: add .github/test-spec.yml (7da0f8e)
  • [nrf noup] drivers: spi_dw: add custom EXMIF peripheral handling (229afea)
  • [nrf noup] scripts: west: build: Use sysbuild by default if in NCS dir (3239cf7)
  • [nrf noup] board: nordic: thingy53: Enable default images for sysbuild (44efb1f)
  • [nrf noup] boards: nordic: Turn off MRAM suspend for NRF54H20 DK (10c0de0)

@anangl anangl requested review from carlescufi, de-nordic, nordic-krch and a team as code owners July 1, 2024 09:45
@anangl anangl requested a review from rlubos July 1, 2024 09:46
@NordicBuilder
Copy link
Contributor

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
hal_nordic zephyrproject-rtos/hal_nordic@a3aacc7 zephyrproject-rtos/hal_nordic@ab5cb2e (master) zephyrproject-rtos/[email protected]

Note: This message is automatically posted and updated by the Manifest GitHub Action.

Copy link
Contributor

@rlubos rlubos left a comment

Choose a reason for hiding this comment

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

diff is empty, so looks good.

@anangl anangl merged commit 10c0de0 into nrfconnect:main Jul 3, 2024
32 of 40 checks passed
@anangl anangl deleted the ncs_2.7.0_rebase branch July 3, 2024 09:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants