This is an automated email from the ASF dual-hosted git repository.
rymek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 64e4e36dbceea102ac334145ae4d045589be1119
Author: Jerzy Kasenberg <jerzy.kasenb...@codecoup.pl>
AuthorDate: Wed Jan 10 09:49:16 2024 +0100
hw/bsp: Update boards to nrfx 3.3.0
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 <jerzy.kasenb...@codecoup.pl>
---
hw/bsp/ada_feather_nrf52/pkg.yml | 1 +
hw/bsp/arduino_primo_nrf52/pkg.yml | 1 +
hw/bsp/bbc_microbit/pkg.yml | 1 +
hw/bsp/ble400/pkg.yml | 1 +
hw/bsp/bmd200/pkg.yml | 1 +
hw/bsp/bmd300eval/pkg.yml | 1 +
hw/bsp/calliope_mini/pkg.yml | 1 +
hw/bsp/dwm1001-dev/pkg.yml | 1 +
hw/bsp/nina-b1/pkg.yml | 1 +
hw/bsp/nordic_pca10028-16k/pkg.yml | 1 +
hw/bsp/nordic_pca10028/pkg.yml | 1 +
hw/bsp/nordic_pca10040/pkg.yml | 1 +
hw/bsp/nordic_pca20020/pkg.yml | 1 +
hw/bsp/nrf51-arduino_101/pkg.yml | 1 +
hw/bsp/nrf51-blenano/pkg.yml | 1 +
hw/bsp/pinetime/pkg.yml | 1 +
hw/bsp/puckjs/pkg.yml | 1 +
hw/bsp/rb-blend2/pkg.yml | 1 +
hw/bsp/rb-nano2/pkg.yml | 1 +
hw/bsp/ruuvitag_rev_b/pkg.yml | 1 +
hw/bsp/telee02/pkg.yml | 1 +
hw/bsp/vbluno51/pkg.yml | 1 +
hw/bsp/vbluno52/pkg.yml | 1 +
23 files changed, 23 insertions(+)
diff --git a/hw/bsp/ada_feather_nrf52/pkg.yml b/hw/bsp/ada_feather_nrf52/pkg.yml
index d75ff688f..0807d9dac 100644
--- 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
index 1624b0afd..cceacf26e 100644
--- 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
index 8659b1945..3d42ed33d 100644
--- 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
index 83365dd05..a9ecd6c29 100644
--- 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
index caced4de6..de9052446 100644
--- 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
index a3037514f..71fde048e 100644
--- 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
index e698a2c91..f838bf2df 100644
--- 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
index f7dfce5cc..e441878c5 100644
--- 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
index 98a2277ab..c5383ea82 100644
--- 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
index c96278f98..70c9f40fc 100644
--- 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
index b0b9ef3af..e45fd4179 100644
--- 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
index 9a0a31c79..54f296384 100644
--- 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
index 142e27d82..599503b2b 100644
--- 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
index 18da86574..5d67dd09f 100644
--- 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
index 7f3dbaab2..222d1fb66 100644
--- 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
index 1423b6189..97fd565ca 100644
--- 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
index a2e9b4277..108370e0a 100644
--- 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
index 0c73c466c..c6401a11b 100644
--- 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
index db2babee4..bf5f3e9ca 100644
--- 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
index bf69a2ff8..ed9556b2b 100644
--- 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
index f9817dd68..b1d1cff0a 100644
--- 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
index a4eac11ae..7aa1ed5a4 100644
--- 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
index 925bdadb8..3dc95eb57 100644
--- 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
