diff --git a/.strider.yml b/.strider.yml
index 532f942ebf6093e8622de3895d7e6bdee6ee9066..5b2cb5fb755621abc7b8f498f1c0d6139a9f0ebf 100644
--- a/.strider.yml
+++ b/.strider.yml
@@ -7,7 +7,8 @@ os:
env:
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=static-tests
- - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4
+ - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_2
+ - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_1
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=x86
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_2
diff --git a/.travis.yml b/.travis.yml
index 799bd4c6404b1f0a0a65eebf7a18a60487dc6082..8c1f19c47f354bbd81ec65f6dc7b59e6f22419bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,8 @@ cache: apt
env:
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=static-tests
- - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4
+ - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_2
+ - NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m4_1
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m0
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=x86
- NPROC_MAX=8 BUILDTEST_MCU_GROUP=cortex_m3_2
diff --git a/boards/ek-lm4f120xl/Makefile.features b/boards/ek-lm4f120xl/Makefile.features
index 6e1aadc9bb61c435a7eb85c56dcbc4c74dbae4b5..e7512301629fb0ff5ba64e1290025373efcfad72 100644
--- a/boards/ek-lm4f120xl/Makefile.features
+++ b/boards/ek-lm4f120xl/Makefile.features
@@ -7,4 +7,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_1
diff --git a/boards/f4vi1/Makefile.features b/boards/f4vi1/Makefile.features
index ba66d40ddc6612fb3850099cf165a69552a5b32c..d4b3ddc664878f1d9ffd64920febcf3515339039 100644
--- a/boards/f4vi1/Makefile.features
+++ b/boards/f4vi1/Makefile.features
@@ -6,4 +6,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_1
diff --git a/boards/frdm-k64f/Makefile.features b/boards/frdm-k64f/Makefile.features
index 3498bc003a238085c525ec466d30a1b980f9e3bb..5af6731c7ddf6b7a3807f98fcb2722068d1fe7f5 100644
--- a/boards/frdm-k64f/Makefile.features
+++ b/boards/frdm-k64f/Makefile.features
@@ -15,4 +15,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+EATURES_MCU_GROUP = cortex_m4_1
diff --git a/boards/msbiot/Makefile.features b/boards/msbiot/Makefile.features
index 1a8593a5bc87bc8cd348152dd8095a2872cdf1e1..5eed74d7dbd17c99b8aa23d21c92ea90b7111957 100644
--- a/boards/msbiot/Makefile.features
+++ b/boards/msbiot/Makefile.features
@@ -13,4 +13,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_1
diff --git a/boards/mulle/Makefile.features b/boards/mulle/Makefile.features
index 3498bc003a238085c525ec466d30a1b980f9e3bb..3b88dfa032e961296a05d96a0c85da41a1198795 100644
--- a/boards/mulle/Makefile.features
+++ b/boards/mulle/Makefile.features
@@ -15,4 +15,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_2
diff --git a/boards/nucleo-f303/Makefile.features b/boards/nucleo-f303/Makefile.features
index e61ddf3c3c2b74c10062bf17c65030e471f24aa0..de4ddbf68042968058d141e2d688f951eea08b9d 100755
--- a/boards/nucleo-f303/Makefile.features
+++ b/boards/nucleo-f303/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_2
diff --git a/boards/nucleo-f334/Makefile.features b/boards/nucleo-f334/Makefile.features
index 3e52f522fcda6cb93271bfb6e60899bdf6ec7674..5a6a4e7cae79b68be7d8baf8562f5150b8865089 100644
--- a/boards/nucleo-f334/Makefile.features
+++ b/boards/nucleo-f334/Makefile.features
@@ -9,4 +9,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_2
diff --git a/boards/nucleo-f401/Makefile.features b/boards/nucleo-f401/Makefile.features
index ce26485fae4631897020e17c12b318231c75e284..40fed70faaaae77f447dc8d03d2615473c092d8e 100644
--- a/boards/nucleo-f401/Makefile.features
+++ b/boards/nucleo-f401/Makefile.features
@@ -4,4 +4,4 @@ FEATURES_PROVIDED += periph_gpio
FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_cpuid
FEATURES_PROVIDED += periph_timer
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_2
diff --git a/boards/pba-d-01-kw2x/Makefile.features b/boards/pba-d-01-kw2x/Makefile.features
index 1138a7e08e1cf720e9b78683cd8b313a390ea34f..9986b3a3626c416474e8f718c28188a7adb6343f 100644
--- a/boards/pba-d-01-kw2x/Makefile.features
+++ b/boards/pba-d-01-kw2x/Makefile.features
@@ -14,4 +14,4 @@ FEATURES_PROVIDED += periph_uart
# Various other features (if any)
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_1
diff --git a/boards/slwstk6220a/Makefile.features b/boards/slwstk6220a/Makefile.features
index 95601352c6b7f4f96a3cbbc66658160de66b18ee..63583eed956466fe10839f3c60ea7d30cff722b3 100644
--- a/boards/slwstk6220a/Makefile.features
+++ b/boards/slwstk6220a/Makefile.features
@@ -5,4 +5,4 @@ FEATURES_PROVIDED += periph_gpio
FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_1
diff --git a/boards/stm32f3discovery/Makefile.features b/boards/stm32f3discovery/Makefile.features
index e61ddf3c3c2b74c10062bf17c65030e471f24aa0..2a9cc42b4f364c580b99a8ec9dc7167c73d4d992 100644
--- a/boards/stm32f3discovery/Makefile.features
+++ b/boards/stm32f3discovery/Makefile.features
@@ -11,4 +11,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += cpp
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_1
diff --git a/boards/stm32f4discovery/Makefile.features b/boards/stm32f4discovery/Makefile.features
index 40ac9027de40d5cf669e8bda9b8fdf3675c7ef9e..5c129e58d93d42bcdcac2d86fb44bdd371446215 100644
--- a/boards/stm32f4discovery/Makefile.features
+++ b/boards/stm32f4discovery/Makefile.features
@@ -15,7 +15,7 @@ FEATURES_PROVIDED += cpp
FEATURES_PROVIDED += arduino
# The board MPU family (used for grouping by the CI system)
-FEATURES_MCU_GROUP = cortex_m4
+FEATURES_MCU_GROUP = cortex_m4_2
# TODO: re-think concept for conflicts based on actual used peripherals...
FEATURES_CONFLICT += periph_spi:periph_dac
diff --git a/dist/tools/drone-scripts/build_and_test.sh b/dist/tools/drone-scripts/build_and_test.sh
index 93eb1d0520716b40ef2e472965c600dc5e8400f1..99e455a95ac5e553828c32c10d9cfee984020912 100755
--- a/dist/tools/drone-scripts/build_and_test.sh
+++ b/dist/tools/drone-scripts/build_and_test.sh
@@ -66,7 +66,7 @@ if $FULL_CHECK; then
# output)
parallel -k exec_build_func {} "$@" ::: static-tests avr8 msp430 x86 arm7 \
cortex_m0 cortex_m3_1 cortex_m3_2 \
- cortex_m4 \
+ cortex_m4_1 cortex_m4_2 \
|& tee -a "$MYTMPDIR/output.log"
else
echo "PR not ready for CI build. Only static-tests will be executed!"
diff --git a/dist/tools/travis-scripts/get-pkg-list.py b/dist/tools/travis-scripts/get-pkg-list.py
index 2d3ccfa94e4165e6885b0d3681980bbb4504199b..777af8de88c36f65848ae05af073155e4808b07b 100755
--- a/dist/tools/travis-scripts/get-pkg-list.py
+++ b/dist/tools/travis-scripts/get-pkg-list.py
@@ -20,7 +20,8 @@
import os
-arm_mcu_groups = ["arm7", "cortex_m0", "cortex_m3_1", "cortex_m3_2", "cortex_m4"]
+arm_mcu_groups = ["arm7", "cortex_m0", "cortex_m3_1", "cortex_m3_2",
+ "cortex_m4_1", "cortex_m4_2"]
msp_mcu_groups = ["msp430"]
x86_mcu_groups = ["x86"]
avr8_mcu_groups = ["avr8"]