From d65d213def35d78c89fcd60082b0e88ad5b89b06 Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Thu, 3 Dec 2015 17:38:24 +0100
Subject: [PATCH] CI: split up Cortex-M4 in two groups
---
.strider.yml | 3 ++-
.travis.yml | 3 ++-
boards/ek-lm4f120xl/Makefile.features | 2 +-
boards/f4vi1/Makefile.features | 2 +-
boards/frdm-k64f/Makefile.features | 2 +-
boards/msbiot/Makefile.features | 2 +-
boards/mulle/Makefile.features | 2 +-
boards/nucleo-f303/Makefile.features | 2 +-
boards/nucleo-f334/Makefile.features | 2 +-
boards/nucleo-f401/Makefile.features | 2 +-
boards/pba-d-01-kw2x/Makefile.features | 2 +-
boards/slwstk6220a/Makefile.features | 2 +-
boards/stm32f3discovery/Makefile.features | 2 +-
boards/stm32f4discovery/Makefile.features | 2 +-
dist/tools/drone-scripts/build_and_test.sh | 2 +-
dist/tools/travis-scripts/get-pkg-list.py | 3 ++-
16 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/.strider.yml b/.strider.yml
index 532f942ebf..5b2cb5fb75 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 799bd4c640..8c1f19c47f 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 6e1aadc9bb..e751230162 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 ba66d40ddc..d4b3ddc664 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 3498bc003a..5af6731c7d 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 1a8593a5bc..5eed74d7db 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 3498bc003a..3b88dfa032 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 e61ddf3c3c..de4ddbf680 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 3e52f522fc..5a6a4e7cae 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 ce26485fae..40fed70faa 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 1138a7e08e..9986b3a362 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 95601352c6..63583eed95 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 e61ddf3c3c..2a9cc42b4f 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 40ac9027de..5c129e58d9 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 93eb1d0520..99e455a95a 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 2d3ccfa94e..777af8de88 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"]
--
GitLab