cpu/nrf52: add missing vendor files #14061
Merged
Conversation
This file contains 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
Those make our lives much easier.
benpicco
added
Type: enhancement
benpicco
added
the
CI: ready for build
SPI1 and TWI0 share the same IRQ, not SPI1 and TWI1
|
We can also do --- a/cpu/nrf52/include/cpu_conf.h
+++ b/cpu/nrf52/include/cpu_conf.h
@@ -66,14 +66,12 @@ extern "C" {
* @brief Flash page configuration
* @{
*/
-#define FLASHPAGE_SIZE (4096U)
-
-#if defined(CPU_MODEL_NRF52811XXAA)
-#define FLASHPAGE_NUMOF (48U)
-#elif defined(CPU_MODEL_NRF52832XXAA)
-#define FLASHPAGE_NUMOF (128U)
+#ifdef BPROT_PRESENT
+#define FLASHPAGE_SIZE BPROT_REGIONS_SIZE
+#define FLASHPAGE_NUMOF BPROT_REGIONS_NUM
#elif defined(CPU_MODEL_NRF52840XXAA)
-#define FLASHPAGE_NUMOF (256U)
+#define FLASHPAGE_SIZE (4096U)
+#define FLASHPAGE_NUMOF (256U)
#endifnow |
bergzand
added
State: waiting for other PR
|
Thanks for fixing. Learning by doing :) Next time, I will be aware of it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Contribution description
When adding support for nrf52811 (#14008) the vendor file for the new CPU was forgotten.
But then I also noticed we don't include the
nrf528xx_peripherals.hfiles yet, which make life much easier.Before we start to re-define those constants, better add the proper vendor file.
Testing procedure
Issues/PRs references
needed for #14057