[nrf fromtree] drivers: flash: nrf_qspi_nor: Fix compilation with QER set to NONE #3514
+18
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
Nov 19, 2025
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#3514 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
nordic-piks
approved these changes
Nov 19, 2025
… set to NONE This is a follow-up to commit d1abe40. Function `qspi_wait_while_writing()` (and also `qspi_rdsr()` that is called by it) is now always required for `qspi_erase()`, so it can no longer be under `#if !IS_EQUAL(INST_0_QER, JESD216_DW15_QER_VAL_NONE)`. Also definition of `dev_config` in `configure_chip()` needs to be moved, as for QER set to NONE, it is not used and causes a compilation warning. Add a test case that will ensure the driver can be built successfully with `quad-enable-requirements = "NONE"`. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no> (cherry picked from commit 68fab5f)
anangl
force-pushed
the
nrf_qspi_nor_fix_qer_none_ncs
branch
from
71a6069 to
5c03e6f
Compare
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
Nov 19, 2025
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#3514 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
de-nordic
approved these changes
Nov 20, 2025
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
Nov 20, 2025
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#3514 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
rlubos
pushed a commit
to nrfconnect/sdk-nrf
that referenced
this pull request
Nov 20, 2025
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#3514 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a follow-up to commit d1abe40.
Function
qspi_wait_while_writing()(and alsoqspi_rdsr()that is called by it) is now always required forqspi_erase(), so it can no longer be under#if !IS_EQUAL(INST_0_QER, JESD216_DW15_QER_VAL_NONE).Also definition of
dev_configinconfigure_chip()needs to be moved, as for QER set to NONE, it is not used and causes a compilation warning.Add a test case that will ensure the driver can be built successfully with
quad-enable-requirements = "NONE".(cherry picked from commit 68fab5f)