hw/bsp: Update boards to nrfx 3.3.0

kasjer · rymanluk · commit 64e4e36dbcee · 2024-01-17T10:54:24.000+01:00
Now nrfx_config.h uses more specific selector for Nordic MCUs.
This adds definition NRF5xxxx_XXAA to all affected BSPs.
Definition NRF52/1 is still in place in case code other then NRFX
needs it.

Signed-off-by: Jerzy Kasenberg &lt;jerzy.kasenberg@codecoup.pl&gt;
diff --git a/hw/bsp/ada_feather_nrf52/pkg.yml b/hw/bsp/ada_feather_nrf52/pkg.yml
@@ -29,6 +29,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF52'
+    - '-DNRF52832_XXAA'
 
 pkg.cflags.HARDFLOAT:
     - -mfloat-abi=hard -mfpu=fpv4-sp-d16
diff --git a/hw/bsp/arduino_primo_nrf52/pkg.yml b/hw/bsp/arduino_primo_nrf52/pkg.yml
@@ -29,6 +29,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF52'
+    - '-DNRF52832_XXAA'
 
 pkg.cflags.HARDFLOAT:
     - -mfloat-abi=hard -mfpu=fpv4-sp-d16
diff --git a/hw/bsp/bbc_microbit/pkg.yml b/hw/bsp/bbc_microbit/pkg.yml
@@ -28,6 +28,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF51'
+    - '-DNRF51822_XXAA'
 
 pkg.deps:
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
diff --git a/hw/bsp/ble400/pkg.yml b/hw/bsp/ble400/pkg.yml
@@ -29,6 +29,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF51'
+    - '-DNRF51822_XXAA'
 
 pkg.deps:
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
diff --git a/hw/bsp/bmd200/pkg.yml b/hw/bsp/bmd200/pkg.yml
@@ -29,6 +29,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF51'
+    - '-DNRF51822_XXAA'
 
 pkg.deps:
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
diff --git a/hw/bsp/bmd300eval/pkg.yml b/hw/bsp/bmd300eval/pkg.yml
@@ -29,6 +29,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF52'
+    - '-DNRF52832_XXAA'
 
 pkg.cflags.HARDFLOAT:
     - -mfloat-abi=hard -mfpu=fpv4-sp-d16
diff --git a/hw/bsp/calliope_mini/pkg.yml b/hw/bsp/calliope_mini/pkg.yml
@@ -28,6 +28,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF51'
+    - '-DNRF51822_XXAA'
 
 pkg.deps:
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
diff --git a/hw/bsp/dwm1001-dev/pkg.yml b/hw/bsp/dwm1001-dev/pkg.yml
@@ -28,6 +28,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF52'
+    - '-DNRF52832_XXAA'
 
 pkg.cflags.HARDFLOAT:
     - -mfloat-abi=hard -mfpu=fpv4-sp-d16
diff --git a/hw/bsp/nina-b1/pkg.yml b/hw/bsp/nina-b1/pkg.yml
@@ -28,6 +28,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF52'
+    - '-DNRF52832_XXAA'
 
 pkg.cflags.HARDFLOAT:
     - -mfloat-abi=hard -mfpu=fpv4-sp-d16
diff --git a/hw/bsp/nordic_pca10028-16k/pkg.yml b/hw/bsp/nordic_pca10028-16k/pkg.yml
@@ -30,6 +30,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF51'
+    - '-DNRF51422_XXAA'
 
 pkg.deps:
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
diff --git a/hw/bsp/nordic_pca10028/pkg.yml b/hw/bsp/nordic_pca10028/pkg.yml
@@ -30,6 +30,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF51'
+    - '-DNRF51422_XXAA'
 
 pkg.deps:
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
diff --git a/hw/bsp/nordic_pca10040/pkg.yml b/hw/bsp/nordic_pca10040/pkg.yml
@@ -30,6 +30,7 @@ pkg.keywords:
 
 pkg.cflags:
      - '-DNRF52'
+     - '-DNRF52832_XXAA'
 
 pkg.cflags.HARDFLOAT:
     - -mfloat-abi=hard -mfpu=fpv4-sp-d16
diff --git a/hw/bsp/nordic_pca20020/pkg.yml b/hw/bsp/nordic_pca20020/pkg.yml
@@ -29,6 +29,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF52'
+    - '-DNRF52832_XXAA'
 
 pkg.cflags.HARDFLOAT:
     - -mfloat-abi=hard -mfpu=fpv4-sp-d16
diff --git a/hw/bsp/nrf51-arduino_101/pkg.yml b/hw/bsp/nrf51-arduino_101/pkg.yml
@@ -28,6 +28,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF51'
+    - '-DNRF51822_XXAA'
 
 pkg.deps:
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
diff --git a/hw/bsp/nrf51-blenano/pkg.yml b/hw/bsp/nrf51-blenano/pkg.yml
@@ -29,6 +29,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF51'
+    - '-DNRF51822_XXAA'
 
 pkg.deps:
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
diff --git a/hw/bsp/pinetime/pkg.yml b/hw/bsp/pinetime/pkg.yml
@@ -29,6 +29,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF52'
+    - '-DNRF52832_XXAA'
     # TODO: Move to more specific variable, however this currently causes a build failure '-DNRF52832_XXAA'
 
 pkg.deps:
diff --git a/hw/bsp/puckjs/pkg.yml b/hw/bsp/puckjs/pkg.yml
@@ -29,6 +29,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF52'
+    - '-DNRF52832_XXAA'
 
 pkg.cflags.HARDFLOAT:
     - -mfloat-abi=hard -mfpu=fpv4-sp-d16
diff --git a/hw/bsp/rb-blend2/pkg.yml b/hw/bsp/rb-blend2/pkg.yml
@@ -29,6 +29,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF52'
+    - '-DNRF52832_XXAA'
 
 pkg.cflags.HARDFLOAT:
     - -mfloat-abi=hard -mfpu=fpv4-sp-d16
diff --git a/hw/bsp/rb-nano2/pkg.yml b/hw/bsp/rb-nano2/pkg.yml
@@ -29,6 +29,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF52'
+    - '-DNRF52832_XXAA'
 
 pkg.cflags.HARDFLOAT:
     - -mfloat-abi=hard -mfpu=fpv4-sp-d16
diff --git a/hw/bsp/ruuvitag_rev_b/pkg.yml b/hw/bsp/ruuvitag_rev_b/pkg.yml
@@ -29,6 +29,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF52'
+    - '-DNRF52832_XXAA'
 
 pkg.cflags.HARDFLOAT:
     - -mfloat-abi=hard -mfpu=fpv4-sp-d16
diff --git a/hw/bsp/telee02/pkg.yml b/hw/bsp/telee02/pkg.yml
@@ -29,6 +29,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF52'
+    - '-DNRF52832_XXAA'
 
 pkg.cflags.HARDFLOAT:
     - -mfloat-abi=hard -mfpu=fpv4-sp-d16
diff --git a/hw/bsp/vbluno51/pkg.yml b/hw/bsp/vbluno51/pkg.yml
@@ -28,6 +28,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF51'
+    - '-DNRF51822_XXAA'
 
 pkg.deps:
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
diff --git a/hw/bsp/vbluno52/pkg.yml b/hw/bsp/vbluno52/pkg.yml
@@ -28,6 +28,7 @@ pkg.keywords:
 
 pkg.cflags:
     - '-DNRF52'
+    - '-DNRF52832_XXAA'
 
 pkg.cflags.HARDFLOAT:
     - -mfloat-abi=hard -mfpu=fpv4-sp-d16
