tree wide: accomodate RISC-V toolchain update & boards/common/makefiles/stdio_cdc_acm.dep.mk: fix [backport 2024.01]

boards/common/makefiles/stdio_cdc_acm.dep.mk

@@ -1,5 +1,5 @@
 ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE))))
-  ifneq (,$(filter tinyusb_device,$(USEMODULE)))
+  ifneq (,$(filter tinyusb_device,$(USEMODULE))$(filter tinyusb,$(USEPKG)))
     # Use stdio_tinyusb_cdc_acm only if no other stdio is requested explicitly
     # and tinyusb_device is used for any other reason
     USEMODULE += stdio_tinyusb_cdc_acm

dist/tools/ci/print_toolchain_versions.sh

@@ -7,7 +7,7 @@
         return
     fi
 
     VERSION_RAW=$( ($@ --version) 2>&1)
     ERR=$?
     VERSION=$(echo "$VERSION_RAW" | head -n 1)
 
@@ -23,7 +23,7 @@
 get_define() {
     local cc="$1"
     local line=
     if command -v "$cc" 2>&1 >/dev/null; then
         line=$(echo "$3" | "$cc" -x c -include "$2" -E -o - - 2>/dev/null | sed -e '/^[   ]*#/d' -e '/^[  ]*$/d')
     fi
     if [ -z "$line" ]; then
@@ -37,12 +37,12 @@
 }
 
 get_os_info() {
     local os="$(uname -s)"
     local osname="unknown"
     local osvers="unknown"
     if [ "$os" = "Linux" ]; then
         osname="$(cat /etc/os-release | grep ^NAME= | awk -F'=' '{print $2}')"
         osvers="$(cat /etc/os-release | grep ^VERSION= | awk -F'=' '{print $2}')"
     elif [ "$os" = "Darwin" ]; then
         osname="$(sw_vers -productName)"
         osvers="$(sw_vers -productVersion)"
@@ -54,7 +54,7 @@
 }
 
 extract_shell_version() {
     SHELL_NAME=$"(basename $1)"
     SHELL_VERSION="$($1 --version 2>/dev/null)"
     ERR=$?
     if [ $ERR -ne 0 ] ; then # if it does not like the --version switch, it is probably dash
@@ -128,7 +128,6 @@
          msp430-elf \
          riscv-none-elf \
          riscv64-unknown-elf \
-         riscv-none-embed \
          riscv32-esp-elf \
          xtensa-esp32-elf \
          xtensa-esp32s2-elf \
@@ -147,7 +146,6 @@
          msp430-elf \
          riscv-none-elf \
          riscv64-unknown-elf \
-         riscv-none-embed \
          riscv32-esp-elf \
          xtensa-esp32-elf \
          xtensa-esp32s2-elf \

examples/asymcute_mqttsn/Makefile.ci

@@ -12,8 +12,6 @@ BOARD_INSUFFICIENT_MEMORY := \
     bluepill-stm32f030c8 \
     calliope-mini \
     derfmega128 \
-    hifive1 \
-    hifive1b \
     i-nucleo-lrwan1 \
     im880b \
     microbit \

examples/cord_ep/Makefile.ci

@@ -10,8 +10,6 @@ BOARD_INSUFFICIENT_MEMORY := \
     atxmega-a3bu-xplained \
     bluepill-stm32f030c8 \
     derfmega128 \
-    hifive1 \
-    hifive1b \
     i-nucleo-lrwan1 \
     im880b \
     microduino-corerf \

examples/cord_epsim/Makefile.ci

@@ -8,8 +8,6 @@ BOARD_INSUFFICIENT_MEMORY := \
     atmega328p-xplained-mini \
     atmega8 \
     bluepill-stm32f030c8 \
-    hifive1 \
-    hifive1b \
     i-nucleo-lrwan1 \
     msb-430 \
     msb-430h \

examples/cord_lc/Makefile.ci

@@ -10,8 +10,6 @@ BOARD_INSUFFICIENT_MEMORY := \
     atxmega-a3bu-xplained \
     bluepill-stm32f030c8 \
     chronos \
-    hifive1 \
-    hifive1b \
     i-nucleo-lrwan1 \
     im880b \
     msb-430 \

examples/emcute_mqttsn/Makefile.ci

@@ -10,8 +10,6 @@ BOARD_INSUFFICIENT_MEMORY := \
     atxmega-a3bu-xplained \
     bluepill-stm32f030c8 \
     derfmega128 \
-    hifive1 \
-    hifive1b \
     i-nucleo-lrwan1 \
     im880b \
     microduino-corerf \

examples/javascript/Makefile.ci

@@ -46,7 +46,6 @@ BOARD_INSUFFICIENT_MEMORY := \
     samd10-xmini \
     saml10-xpro \
     saml11-xpro \
-    seeedstudio-gd32 \
     sipeed-longan-nano \
     sipeed-longan-nano-tft \
     slstk3400a \

makefiles/arch/riscv.inc.mk

@@ -8,12 +8,9 @@
 # Ubuntu uses "riscv64-unknown-elf" despite being able to produce both 32 and
 # 64 bit binaries. We'll test all possible combinations from the most correct
 # triple to the least correct triple all that might be able to produce our
-# binaries. Finally, "riscv-none-embed" is also tested for compatibility with
-# an previously popular legacy toolchain.
-# For a CI transition period, it is tested first.
+# binaries.
 
 _TRIPLES_TO_TEST := \
-    riscv-none-embed \
     riscv32-none-elf \
     riscv32-unknown-elf \
     riscv32-elf \
@@ -27,7 +24,7 @@ _TRIPLES_TO_TEST := \
 # Do not test at run time if building with docker: The host may have no
 # RISC-V toolchain installed or a different one
 ifeq (1,$(BUILD_IN_DOCKER))
-  TARGET_ARCH_RISCV := riscv-none-embed
+  TARGET_ARCH_RISCV := riscv-none-elf
 endif
 
 TARGET_ARCH_RISCV ?= \

makefiles/cargo-targets.inc.mk

@@ -37,7 +37,6 @@ $(CARGO_COMPILE_COMMANDS): $(BUILDDEPS)
 	        -e 's/"riscv64-none-elf"/"riscv32"/g' \
 	        -e 's/"riscv64-unknown-elf"/"riscv32"/g' \
 	        -e 's/"riscv64-elf"/"riscv32"/g' \
-	        -e 's/"riscv-none-embed"/"riscv32"/g' \
 	  | $(LAZYSPONGE) $@
 
 

tests/bench/xtimer_load/Makefile

@@ -9,4 +9,7 @@ CFLAGS += -DTEST_HZ=$(TEST_HZ)LU
 # microbit qemu failing currently
 TEST_ON_CI_BLACKLIST += microbit
 
+# This test randomly fails on `native` so disable it from CI
+TEST_ON_CI_BLACKLIST += native native64
+
 include $(RIOTBASE)/Makefile.include

tests/core/thread_flags/Makefile

@@ -6,4 +6,7 @@ USEMODULE += xtimer
 # microbit qemu timing is off
 TEST_ON_CI_BLACKLIST += microbit
 
+# This test randomly fails on `native` so disable it from CI
+TEST_ON_CI_BLACKLIST += native native64
+
 include $(RIOTBASE)/Makefile.include

tests/net/gcoap_dns/Makefile.ci

@@ -17,6 +17,8 @@ BOARD_INSUFFICIENT_MEMORY := \
     bluepill-stm32f103c8 \
     calliope-mini \
     derfmega128 \
+    hifive1 \
+    hifive1b \
     i-nucleo-lrwan1 \
     im880b \
     mega-xplained \

tests/net/gnrc_dhcpv6_relay/Makefile.ci

@@ -9,8 +9,6 @@ BOARD_INSUFFICIENT_MEMORY := \
     atmega8 \
     atxmega-a3bu-xplained \
     bluepill-stm32f030c8 \
-    hifive1 \
-    hifive1b \
     i-nucleo-lrwan1 \
     im880b \
     msb-430 \

tests/net/gnrc_ipv6_ext/Makefile.ci

@@ -9,8 +9,6 @@ BOARD_INSUFFICIENT_MEMORY := \
     atmega8 \
     atxmega-a3bu-xplained \
     bluepill-stm32f030c8 \
-    hifive1 \
-    hifive1b \
     i-nucleo-lrwan1 \
     im880b \
     msb-430 \

tests/net/gnrc_netif_ipv6_wait_for_global_address/Makefile.ci

@@ -8,6 +8,8 @@ BOARD_INSUFFICIENT_MEMORY := \
     atmega328p-xplained-mini \
     atmega8 \
     bluepill-stm32f030c8 \
+    hifive1 \
+    hifive1b \
     i-nucleo-lrwan1 \
     msb-430 \
     msb-430h \

tests/net/gnrc_rpl/Makefile

@@ -27,7 +27,7 @@ host-tools:
 
 TEST_DEPS += host-tools
 
-include $(RIOTBASE)/Makefile.include
-
 # Test is flaky and regularly derails unrelated merge trains
-TEST_ON_CI_BLACKLIST += native
+TEST_ON_CI_BLACKLIST += native native64
+
+include $(RIOTBASE)/Makefile.include

tests/net/gnrc_rpl_srh/Makefile.ci

@@ -9,8 +9,6 @@ BOARD_INSUFFICIENT_MEMORY := \
     atmega8 \
     atxmega-a3bu-xplained \
     bluepill-stm32f030c8 \
-    hifive1 \
-    hifive1b \
     i-nucleo-lrwan1 \
     im880b \
     msb-430 \

tests/net/gnrc_sock_dns/Makefile.ci

@@ -9,8 +9,6 @@ BOARD_INSUFFICIENT_MEMORY := \
     atmega8 \
     atxmega-a3bu-xplained \
     bluepill-stm32f030c8 \
-    hifive1 \
-    hifive1b \
     i-nucleo-lrwan1 \
     msb-430 \
     msb-430h \

tests/pkg/edhoc_c/Makefile.ci

@@ -12,8 +12,6 @@ BOARD_INSUFFICIENT_MEMORY := \
     cc2650stk \
     e104-bt5010a-tb \
     e104-bt5011a-tb \
-    hifive1 \
-    hifive1b \
     i-nucleo-lrwan1 \
     im880b \
     lsn50 \

tests/pkg/lwip/Makefile.ci

@@ -3,8 +3,6 @@ BOARD_INSUFFICIENT_MEMORY := \
     blackpill-stm32f103c8 \
     bluepill-stm32f030c8 \
     bluepill-stm32f103c8 \
-    hifive1 \
-    hifive1b \
     i-nucleo-lrwan1 \
     nrf6310 \
     nucleo-f030r8 \

tests/sys/conn_can/Makefile.ci

@@ -1,8 +1,6 @@
 BOARD_INSUFFICIENT_MEMORY := \
     airfy-beacon \
     calliope-mini \
-    hifive1 \
-    hifive1b \
     i-nucleo-lrwan1 \
     im880b \
     microbit \

tests/sys/evtimer_underflow/Makefile

@@ -6,4 +6,7 @@ USEMODULE += ztimer_msec
 # microbit qemu lacks rtt
 TEST_ON_CI_BLACKLIST += microbit
 
+# This test randomly fails on `native` so disable it from CI
+TEST_ON_CI_BLACKLIST += native native64
+
 include $(RIOTBASE)/Makefile.include

tests/sys/pthread_cooperation/Makefile.ci

@@ -1,7 +1,5 @@
 BOARD_INSUFFICIENT_MEMORY := \
     atmega8 \
-    hifive1 \
-    hifive1b \
     i-nucleo-lrwan1 \
     im880b \
     nucleo-f031k6 \

tests/sys/xtimer_hang/Makefile

@@ -21,4 +21,7 @@ DISABLE_MODULE := core_msg
 # microbit qemu failing currently
 TEST_ON_CI_BLACKLIST += microbit
 
+# This test randomly fails on `native` so disable it from CI
+TEST_ON_CI_BLACKLIST += native native64
+
 include $(RIOTBASE)/Makefile.include

tests/sys/ztimer_msg/Makefile

@@ -8,4 +8,8 @@ USEMODULE += ztimer_usec
 # uncomment this to test using ztimer sec
 #USEMODULE += ztimer_sec
 
+# The test is sensitive to background CPU load. On the CI workers a lot of
+# compilation tasks are run in parallel, making this test randomly fail.
+TEST_ON_CI_BLACKLIST += native native64
+
 include $(RIOTBASE)/Makefile.include

tests/sys/ztimer_overhead/Makefile

@@ -9,4 +9,8 @@ USEMODULE += ztimer_usec
 # microbit qemu timing is off
 TEST_ON_CI_BLACKLIST += microbit
 
+# The test is sensitive to background CPU load. On the CI workers a lot of
+# compilation tasks are run in parallel, making this test randomly fail.
+TEST_ON_CI_BLACKLIST += native
+
 include $(RIOTBASE)/Makefile.include

tests/sys/ztimer_underflow/Makefile

@@ -20,4 +20,7 @@ CFLAGS += -DTEST_ZTIMER_CLOCK=$(TEST_ZTIMER_CLOCK)
 # microbit qemu failing currently
 TEST_ON_CI_BLACKLIST += microbit
 
+# This test randomly fails on `native` so disable it from CI
+TEST_ON_CI_BLACKLIST += native native64
+
 include $(RIOTBASE)/Makefile.include