From e4bee51a9d26b8f72113a1713f5d0fa00c7d92f6 Mon Sep 17 00:00:00 2001 From: kenrabold Date: Tue, 25 Jun 2019 10:17:36 -0700 Subject: [PATCH] tests/* : blacklisting for hifive1b --- boards/hifive1b/Makefile.features | 3 --- boards/hifive1b/board.c | 30 +++++++++++++++--------------- tests/conn_can/Makefile | 2 +- tests/gnrc_ipv6_ext/Makefile | 2 +- tests/gnrc_netif/Makefile | 2 +- tests/gnrc_rpl_srh/Makefile | 2 +- tests/gnrc_sixlowpan/Makefile | 2 +- tests/gnrc_sock_dns/Makefile | 2 +- tests/gnrc_tcp_client/Makefile | 2 +- tests/gnrc_tcp_server/Makefile | 2 +- tests/gnrc_udp/Makefile | 2 +- tests/lwip/Makefile | 2 +- tests/periph_timer/Makefile | 2 +- tests/pkg_relic/Makefile | 1 + tests/pkg_ubasic/Makefile | 1 + tests/pthread_cooperation/Makefile | 2 +- 16 files changed, 29 insertions(+), 30 deletions(-) diff --git a/boards/hifive1b/Makefile.features b/boards/hifive1b/Makefile.features index 558702a560..e2d05e1f19 100644 --- a/boards/hifive1b/Makefile.features +++ b/boards/hifive1b/Makefile.features @@ -8,7 +8,4 @@ FEATURES_PROVIDED += periph_rtt FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart -# The board MPU family (used for grouping by the CI system) -FEATURES_MCU_GROUP = risc_v - include $(RIOTCPU)/fe310/Makefile.features diff --git a/boards/hifive1b/board.c b/boards/hifive1b/board.c index ea005263a4..0aaf3471a1 100644 --- a/boards/hifive1b/board.c +++ b/boards/hifive1b/board.c @@ -65,10 +65,10 @@ /* * By default the SPI FFMT initialized as: - * cmd_en = 1 - * addr_len = 3 - * cmd_code = 3 - * all other fields = 0 + * cmd_en = 1 + * addr_len = 3 + * cmd_code = 3 + * all other fields = 0 */ void board_init_clock(void) @@ -101,16 +101,16 @@ void board_init_clock(void) __attribute__ ((section (".ramfunc"))) void board_init_flash(void) { - /* Update the QSPI interface to adjust to the CPU speed - * This function needs to execute from the RAM - * when the QSPI interface is being reconfigured because the flash - * can't be accessed during this time - */ + /* Update the QSPI interface to adjust to the CPU speed + * This function needs to execute from the RAM + * when the QSPI interface is being reconfigured because the flash + * can't be accessed during this time + */ - /* Disable SPI flash mode */ - SPI0_REG(SPI_REG_FCTRL) &= ~SPI_FCTRL_EN; + /* Disable SPI flash mode */ + SPI0_REG(SPI_REG_FCTRL) &= ~SPI_FCTRL_EN; - /* Enable QPI mode by sending command to flash */ + /* Enable QPI mode by sending command to flash */ SPI0_REG(SPI_REG_TXFIFO) = 0x35; /* begin{code-style-ignore} */ @@ -125,10 +125,10 @@ void board_init_flash(void) SPI_INSN_PAD_CODE(0x00); /* Dummy cycle sends 0 value bits */ /* end{code-style-ignore} */ - /* Re-enable SPI flash mode */ - SPI0_REG(SPI_REG_FCTRL) |= SPI_FCTRL_EN; + /* Re-enable SPI flash mode */ + SPI0_REG(SPI_REG_FCTRL) |= SPI_FCTRL_EN; - /* Adjust the SPI clk divider for to boost flash speed */ + /* Adjust the SPI clk divider for to boost flash speed */ // SPI0_REG(SPI_REG_SCKDIV) = SCKDIV; } diff --git a/tests/conn_can/Makefile b/tests/conn_can/Makefile index 18abb2168e..7e895d3a01 100644 --- a/tests/conn_can/Makefile +++ b/tests/conn_can/Makefile @@ -2,7 +2,7 @@ include ../Makefile.tests_common BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-leonardo \ arduino-mega2560 arduino-nano \ - arduino-uno chronos hifive1 i-nucleo-lrwan1 \ + arduino-uno chronos hifive1 hifive1b i-nucleo-lrwan1 \ msb-430 msb-430h \ nucleo-f031k6 nucleo-f042k6 nucleo-f303k8 \ nucleo-l031k6 nucleo-f030r8 nucleo-f070rb \ diff --git a/tests/gnrc_ipv6_ext/Makefile b/tests/gnrc_ipv6_ext/Makefile index a2d7a78220..271459021b 100644 --- a/tests/gnrc_ipv6_ext/Makefile +++ b/tests/gnrc_ipv6_ext/Makefile @@ -4,7 +4,7 @@ include ../Makefile.tests_common BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-leonardo \ arduino-mega2560 arduino-nano \ - arduino-uno hifive1 i-nucleo-lrwan1 mega-xplained \ + arduino-uno hifive1 hifive1b i-nucleo-lrwan1 mega-xplained \ msb-430 msb-430h nucleo-f030r8 nucleo-f031k6 \ nucleo-f042k6 nucleo-f070rb nucleo-f072rb \ nucleo-f303k8 nucleo-f334r8 nucleo-l031k6 \ diff --git a/tests/gnrc_netif/Makefile b/tests/gnrc_netif/Makefile index e694885f1f..7453fde6f0 100644 --- a/tests/gnrc_netif/Makefile +++ b/tests/gnrc_netif/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common BOARD_INSUFFICIENT_MEMORY := airfy-beacon arduino-duemilanove arduino-leonardo \ arduino-mega2560 arduino-nano arduino-uno \ b-l072z-lrwan1 blackpill bluepill calliope-mini \ - cc2650-launchpad cc2650stk chronos hifive1 \ + cc2650-launchpad cc2650stk chronos hifive1 hifive1b \ i-nucleo-lrwan1 lsn50 maple-mini \ mega-xplained microbit msb-430 msb-430h \ nrf51dk nrf51dongle nrf6310 \ diff --git a/tests/gnrc_rpl_srh/Makefile b/tests/gnrc_rpl_srh/Makefile index 8d3f4de5aa..a866b3dc31 100644 --- a/tests/gnrc_rpl_srh/Makefile +++ b/tests/gnrc_rpl_srh/Makefile @@ -4,7 +4,7 @@ include ../Makefile.tests_common BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-leonardo \ arduino-mega2560 arduino-nano \ - arduino-uno hifive1 i-nucleo-lrwan1 mega-xplained \ + arduino-uno hifive1 hifive1b i-nucleo-lrwan1 mega-xplained \ msb-430 msb-430h nucleo-f030r8 nucleo-f031k6 \ nucleo-f042k6 nucleo-f070rb nucleo-f072rb \ nucleo-f303k8 nucleo-f334r8 nucleo-l031k6 \ diff --git a/tests/gnrc_sixlowpan/Makefile b/tests/gnrc_sixlowpan/Makefile index 72b0b0d50b..be6f256d0e 100644 --- a/tests/gnrc_sixlowpan/Makefile +++ b/tests/gnrc_sixlowpan/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-leonardo \ arduino-mega2560 arduino-nano arduino-uno chronos \ - hifive1 i-nucleo-lrwan1 msb-430 msb-430h \ + hifive1 hifive1b i-nucleo-lrwan1 msb-430 msb-430h \ nucleo-f030r8 nucleo-f031k6 nucleo-f042k6 \ nucleo-f070rb nucleo-f070rb nucleo-f072rb \ nucleo-f303k8 nucleo-f334r8 nucleo-l031k6 \ diff --git a/tests/gnrc_sock_dns/Makefile b/tests/gnrc_sock_dns/Makefile index 924d949b64..2380c926b1 100644 --- a/tests/gnrc_sock_dns/Makefile +++ b/tests/gnrc_sock_dns/Makefile @@ -4,7 +4,7 @@ RIOTBASE ?= $(CURDIR)/../.. BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-leonardo \ arduino-mega2560 arduino-nano \ - arduino-uno chronos hifive1 i-nucleo-lrwan1 \ + arduino-uno chronos hifive1 hifive1b i-nucleo-lrwan1 \ mega-xplained msb-430 msb-430h \ nucleo-f042k6 nucleo-f031k6 \ nucleo-f030r8 nucleo-f303k8 nucleo-l053r8 \ diff --git a/tests/gnrc_tcp_client/Makefile b/tests/gnrc_tcp_client/Makefile index a536970854..afa93d8ebf 100644 --- a/tests/gnrc_tcp_client/Makefile +++ b/tests/gnrc_tcp_client/Makefile @@ -16,7 +16,7 @@ TCP_TEST_CYCLES ?= 3 BOARD_INSUFFICIENT_MEMORY := airfy-beacon arduino-duemilanove \ arduino-leonardo arduino-mega2560 \ arduino-nano arduino-uno calliope-mini chronos \ - hifive1 i-nucleo-lrwan1 mega-xplained microbit \ + hifive1 hifive1b i-nucleo-lrwan1 mega-xplained microbit \ msb-430 msb-430h nrf51dk nrf51dongle nrf6310 \ nucleo-f031k6 nucleo-f042k6 nucleo-f303k8 \ nucleo-l031k6 nucleo-f030r8 nucleo-f070rb \ diff --git a/tests/gnrc_tcp_server/Makefile b/tests/gnrc_tcp_server/Makefile index 5de1fad344..6750d69f9e 100644 --- a/tests/gnrc_tcp_server/Makefile +++ b/tests/gnrc_tcp_server/Makefile @@ -15,7 +15,7 @@ TCP_TEST_CYCLES ?= 3 BOARD_INSUFFICIENT_MEMORY := airfy-beacon arduino-duemilanove \ arduino-leonardo arduino-mega2560 \ arduino-nano arduino-uno calliope-mini chronos \ - hifive1 i-nucleo-lrwan1 mega-xplained microbit \ + hifive1 hifive1b i-nucleo-lrwan1 mega-xplained microbit \ msb-430 msb-430h \ nrf51dk nrf51dongle nrf6310 nucleo-f031k6 \ nucleo-f042k6 nucleo-f303k8 nucleo-l031k6 \ diff --git a/tests/gnrc_udp/Makefile b/tests/gnrc_udp/Makefile index 9e7b94eb5d..16d201ced2 100644 --- a/tests/gnrc_udp/Makefile +++ b/tests/gnrc_udp/Makefile @@ -2,7 +2,7 @@ include ../Makefile.tests_common BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-leonardo \ arduino-mega2560 arduino-nano \ - arduino-uno calliope-mini chronos hifive1 \ + arduino-uno calliope-mini chronos hifive1 hifive1b \ i-nucleo-lrwan1 \ mega-xplained microbit msb-430 msb-430h \ nucleo-f031k6 nucleo-f042k6 nucleo-f303k8 \ diff --git a/tests/lwip/Makefile b/tests/lwip/Makefile index 3f5432488e..c7e7101b4f 100644 --- a/tests/lwip/Makefile +++ b/tests/lwip/Makefile @@ -8,7 +8,7 @@ BOARD_BLACKLIST := arduino-duemilanove arduino-leonardo \ esp8266-sparkfun-thing jiminy-mega256rfr2 mega-xplained \ msb-430 msb-430h telosb waspmote-pro \ wsn430-v1_3b wsn430-v1_4 z1 -BOARD_INSUFFICIENT_MEMORY := airfy-beacon hifive1 i-nucleo-lrwan1 nrf6310 \ +BOARD_INSUFFICIENT_MEMORY := airfy-beacon hifive1 hifive1b i-nucleo-lrwan1 nrf6310 \ nucleo-f031k6 nucleo-f042k6 \ nucleo-l031k6 nucleo-f030r8 nucleo-f303k8 \ nucleo-f334r8 nucleo-l053r8 stm32f0discovery \ diff --git a/tests/periph_timer/Makefile b/tests/periph_timer/Makefile index ea7a089850..4f43c9e533 100644 --- a/tests/periph_timer/Makefile +++ b/tests/periph_timer/Makefile @@ -6,7 +6,7 @@ TEST_ON_CI_WHITELIST += all ifneq (,$(filter arduino-duemilanove arduino-leonardo arduino-mega2560 arduino-uno waspmote-pro,$(BOARD))) TIMER_SPEED ?= 250000 -else ifneq (,$(filter hifive1 %-kw41z,$(BOARD))) +else ifneq (,$(filter hifive1 hifive1b %-kw41z,$(BOARD))) TIMER_SPEED ?= 32768 endif diff --git a/tests/pkg_relic/Makefile b/tests/pkg_relic/Makefile index 8f4c0940a1..c053530c16 100644 --- a/tests/pkg_relic/Makefile +++ b/tests/pkg_relic/Makefile @@ -9,6 +9,7 @@ BOARD_BLACKLIST := arduino-duemilanove \ chronos \ f4vi1 \ hifive1 \ + hifive1b \ jiminy-mega256rfr2 \ mega-xplained \ msb-430 \ diff --git a/tests/pkg_ubasic/Makefile b/tests/pkg_ubasic/Makefile index 192c67c88e..e235dd7583 100644 --- a/tests/pkg_ubasic/Makefile +++ b/tests/pkg_ubasic/Makefile @@ -15,6 +15,7 @@ BOARD_BLACKLIST := \ esp8266-esp-12x \ esp8266-olimex-mod \ hifive1 \ + hifive1b \ jiminy-mega256rfr2 \ mega-xplained \ msb-430 \ diff --git a/tests/pthread_cooperation/Makefile b/tests/pthread_cooperation/Makefile index 7a2f8052bd..0b25cdf494 100644 --- a/tests/pthread_cooperation/Makefile +++ b/tests/pthread_cooperation/Makefile @@ -1,7 +1,7 @@ include ../Makefile.tests_common BOARD_BLACKLIST := arduino-duemilanove arduino-leonardo arduino-mega2560 \ - arduino-nano arduino-uno hifive1 i-nucleo-lrwan1 \ + arduino-nano arduino-uno hifive1 hifive1b i-nucleo-lrwan1 \ jiminy-mega256rfr2 mega-xplained stm32l0538-disco waspmote-pro # AVR platform: unknown type name: clockid_t