From 5efbb97b5c7a9200acf730d8a329c6f763ed7910 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 10 Jul 2020 15:42:09 +0200 Subject: [PATCH 1/5] dist/testbed-support: remove iotlab wsn430 mapping The boards were removed (EOL) and thus are no longer usable using IOTLAB_NODE --- dist/testbed-support/makefile.iotlab.single.inc.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dist/testbed-support/makefile.iotlab.single.inc.mk b/dist/testbed-support/makefile.iotlab.single.inc.mk index 9bb279a0b210..581d0b60d22d 100644 --- a/dist/testbed-support/makefile.iotlab.single.inc.mk +++ b/dist/testbed-support/makefile.iotlab.single.inc.mk @@ -6,7 +6,7 @@ # * reset # * term # -# Tested on m3/a8-m3/wsn430/samr21/arduino-zero nodes +# Tested on m3/a8-m3/samr21/arduino-zero nodes # # It can be run: # * From your computer by setting IOTLAB_NODE to the full url like @@ -78,8 +78,6 @@ IOTLAB_ARCHI_nrf52840-mdk = nrf52840mdk:multi IOTLAB_ARCHI_pba-d-01-kw2x = phynode:kw2xrf IOTLAB_ARCHI_samr21-xpro = samr21:at86rf233 IOTLAB_ARCHI_samr30-xpro = samr30:at86rf212b -IOTLAB_ARCHI_wsn430-v1_3b = wsn430:cc1101 -IOTLAB_ARCHI_wsn430-v1_4 = wsn430:cc2420 IOTLAB_ARCHI := $(IOTLAB_ARCHI_$(BOARD)) # There are several deprecated and incompatible features used here that were @@ -94,8 +92,8 @@ else _NODES_DEPLOYED = $(shell iotlab-experiment --jmespath='"0"' --format='" ".join' get $(_IOTLAB_EXP_ID) --deployment) _NODES_LIST_OPTION = --nodes _NODES_FLASH_OPTION = --flash - ifneq (,$(filter-out wsn430-% firefly,$(BOARD))) - # All boards in IoT-LAB except firefly and WSN430 can be flashed using $(BINFILE). + ifneq (firefly,$(BOARD)) + # All boards in IoT-LAB except firefly can be flashed using $(BINFILE). # On IoT-LAB, firefly only accepts $(ELFFILE) and WSN320 boards on accept $(HEXFILE). # Using $(BINFILE) speeds up the firmware upload since the file is much # smaller than an elffile. @@ -177,7 +175,7 @@ _STDIN_EQ_0 = grep 0 ifneq (iotlab-a8-m3,$(BOARD)) - # M3 and wsn430 nodes + # M3 nodes FLASHER = iotlab-node RESET = iotlab-node _NODE_FMT = --jmespath='keys(@)[0]' --format='int' From 9d0253bed3cd167cde5bff5473071ab463e8d7a4 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 10 Jul 2020 16:09:25 +0200 Subject: [PATCH 2/5] Makefile.include: remove remaining references to wsn430 --- Makefile.include | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile.include b/Makefile.include index f02da8664164..944bed33fafe 100644 --- a/Makefile.include +++ b/Makefile.include @@ -347,10 +347,8 @@ export PREFIX ?= $(if $(TARGET_ARCH),$(TARGET_ARCH)-) # be done in makefile.iotlab.single.inc.mk which is included after. ifneq (,$(IOTLAB_NODE)) PROGRAMMER ?= iotlab - # iotlab uses ELFFILE by default for flashing boards, except for WSN430. - ifeq (,$(filter wsn430-%,$(BOARD))) - FLASHFILE ?= $(ELFFILE) - endif + # iotlab uses ELFFILE by default for flashing boards. + FLASHFILE ?= $(ELFFILE) endif # Add standard include directories @@ -893,7 +891,7 @@ endif help: @$(MAKE) -qp | sed -ne 's/\(^[a-z][a-z_-]*\):.*/\1/p' | sort | uniq -ifneq (,$(filter iotlab-m3 wsn430-v1_3b wsn430-v1_4,$(BOARD))) +ifeq (iotlab-m3,$(BOARD)) ifneq (,$(filter iotlab-%,$(MAKECMDGOALS))) include $(RIOTBASE)/dist/testbed-support/Makefile.iotlab endif From 8b8e2817894df60c28dc76cbd466e45e31b0438e Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 10 Jul 2020 15:48:40 +0200 Subject: [PATCH 3/5] boards: remove Senslab wsn430 boards These boards are no longer available on IoT-LAB --- boards/common/wsn430/Kconfig | 18 ---- boards/common/wsn430/Makefile | 3 - boards/common/wsn430/Makefile.dep | 2 - boards/common/wsn430/Makefile.features | 8 -- boards/common/wsn430/Makefile.include | 12 --- boards/common/wsn430/board_init.c | 102 -------------------- boards/common/wsn430/include/board_common.h | 77 --------------- boards/common/wsn430/include/periph_conf.h | 94 ------------------ boards/wsn430-v1_3b/Kconfig | 15 --- boards/wsn430-v1_3b/Makefile | 4 - boards/wsn430-v1_3b/Makefile.dep | 1 - boards/wsn430-v1_3b/Makefile.features | 1 - boards/wsn430-v1_3b/Makefile.include | 1 - boards/wsn430-v1_3b/doc.txt | 5 - boards/wsn430-v1_3b/include/board.h | 44 --------- boards/wsn430-v1_4/Kconfig | 15 --- boards/wsn430-v1_4/Makefile | 4 - boards/wsn430-v1_4/Makefile.dep | 1 - boards/wsn430-v1_4/Makefile.features | 1 - boards/wsn430-v1_4/Makefile.include | 1 - boards/wsn430-v1_4/doc.txt | 5 - boards/wsn430-v1_4/include/board.h | 47 --------- 22 files changed, 461 deletions(-) delete mode 100644 boards/common/wsn430/Kconfig delete mode 100644 boards/common/wsn430/Makefile delete mode 100644 boards/common/wsn430/Makefile.dep delete mode 100644 boards/common/wsn430/Makefile.features delete mode 100644 boards/common/wsn430/Makefile.include delete mode 100644 boards/common/wsn430/board_init.c delete mode 100644 boards/common/wsn430/include/board_common.h delete mode 100644 boards/common/wsn430/include/periph_conf.h delete mode 100644 boards/wsn430-v1_3b/Kconfig delete mode 100644 boards/wsn430-v1_3b/Makefile delete mode 100644 boards/wsn430-v1_3b/Makefile.dep delete mode 100644 boards/wsn430-v1_3b/Makefile.features delete mode 100644 boards/wsn430-v1_3b/Makefile.include delete mode 100644 boards/wsn430-v1_3b/doc.txt delete mode 100644 boards/wsn430-v1_3b/include/board.h delete mode 100644 boards/wsn430-v1_4/Kconfig delete mode 100644 boards/wsn430-v1_4/Makefile delete mode 100644 boards/wsn430-v1_4/Makefile.dep delete mode 100644 boards/wsn430-v1_4/Makefile.features delete mode 100644 boards/wsn430-v1_4/Makefile.include delete mode 100644 boards/wsn430-v1_4/doc.txt delete mode 100644 boards/wsn430-v1_4/include/board.h diff --git a/boards/common/wsn430/Kconfig b/boards/common/wsn430/Kconfig deleted file mode 100644 index 9f4b421c2baa..000000000000 --- a/boards/common/wsn430/Kconfig +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2020 HAW Hamburg -# -# This file is subject to the terms and conditions of the GNU Lesser -# General Public License v2.1. See the file LICENSE in the top level -# directory for more details. - -config BOARD - default "wsn430" if BOARD_WSN430 - -config BOARD_COMMON_WSN430 - bool - default y - select CPU_MODEL_MSP430F1611 - select HAS_PERIPH_GPIO - select HAS_PERIPH_GPIO_IRQ - select HAS_PERIPH_TIMER - select HAS_PERIPH_SPI - select HAS_PERIPH_UART diff --git a/boards/common/wsn430/Makefile b/boards/common/wsn430/Makefile deleted file mode 100644 index 68565d52e894..000000000000 --- a/boards/common/wsn430/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -MODULE = boards_common_wsn430 - -include $(RIOTBASE)/Makefile.base diff --git a/boards/common/wsn430/Makefile.dep b/boards/common/wsn430/Makefile.dep deleted file mode 100644 index 05e6908c8664..000000000000 --- a/boards/common/wsn430/Makefile.dep +++ /dev/null @@ -1,2 +0,0 @@ -# include this module in the build -USEMODULE += boards_common_wsn430 diff --git a/boards/common/wsn430/Makefile.features b/boards/common/wsn430/Makefile.features deleted file mode 100644 index b9c7537f0e75..000000000000 --- a/boards/common/wsn430/Makefile.features +++ /dev/null @@ -1,8 +0,0 @@ -CPU = msp430fxyz -CPU_MODEL = msp430f1611 - -# Put defined MCU peripherals here (in alphabetical order) -FEATURES_PROVIDED += periph_gpio periph_gpio_irq -FEATURES_PROVIDED += periph_timer -FEATURES_PROVIDED += periph_spi -FEATURES_PROVIDED += periph_uart diff --git a/boards/common/wsn430/Makefile.include b/boards/common/wsn430/Makefile.include deleted file mode 100644 index afa4e77d4336..000000000000 --- a/boards/common/wsn430/Makefile.include +++ /dev/null @@ -1,12 +0,0 @@ -# use common wsn430 includes -INCLUDES += -I$(RIOTBOARD)/common/wsn430/include - -# configure the serial interface -PORT_LINUX ?= /dev/ttyUSB0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) -include $(RIOTMAKE)/tools/serial.inc.mk - -# configure the flash tool -FLASHER = mspdebug -FLASHFILE ?= $(HEXFILE) -FFLAGS = -d $(PROG_DEV) -j uif "prog $(FLASHFILE)" diff --git a/boards/common/wsn430/board_init.c b/boards/common/wsn430/board_init.c deleted file mode 100644 index 317ce365bb30..000000000000 --- a/boards/common/wsn430/board_init.c +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2013 Milan Babel - * 2017 Freie Universität Berlin - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - - /** - * @ingroup boards_common_wsn430 - * @{ - * - * @file - * @brief Board initialization for WSN430 - * - * @author Milan Babel - * @author Hauke Petersen - * - * @} - */ - -#include "cpu.h" -#include "irq.h" -#include "assert.h" -#include "stdio_uart.h" -#include "periph_conf.h" - -enum { - MCLK_2MHZ_SCLK_1MHZ = (SELM_2 | DIVM_2 | SELS | DIVS_3), - MCLK_4MHZ_SCLK_1MHZ = (SELM_2 | DIVM_1 | SELS | DIVS_3), - MCLK_8MHZ_SCLK_1MHZ = (SELM_2 | SELS | DIVS_3), - MCLK_8MHZ_SCLK_8MHZ = (SELM_2 | SELS), -}; - -static void msb_ports_init(void) -{ - /* Port 1: GDO, Flash, BSL TX */ - P1SEL = 0x02; /* Port1 Select: 00000010 = 0x02 */ - P1OUT = 0x00; /* Port1 Output: 00000000 = 0x00 */ - P1DIR = 0x87; /* Port1 Direction: 10000111 = 0x87 */ - - /* Port 2: GPIO, BSL RX, 1wire */ - P2SEL = 0x04; /* Port2 Select: 00000100 = 0x04 */ - P2OUT = 0x00; /* Port2 Output: 00000000 = 0x00 */ - P2DIR = 0xFF; /* Port2 Direction: 11111111 = 0xFF */ - - - /* Port 3: UART */ - P3SEL = 0xFE; /* Port3 Select: 11111110 = 0xFE */ - P3OUT = 0x00; /* Port3 Output: 00000000 = 0x00 */ - P3DIR = 0xFF; /* Port3 Direction: 11111111 = 0xFF */ - - - /* Port 4: CS */ - P4SEL = 0x00; /* Port4 Select: 00000000 = 0x00 */ - P4OUT = 0x14; /* Port4 Output: 00010100 = 0x14 */ - P4DIR = 0xFF; /* Port4 Direction: 11111111 = 0xFF */ - - /* Port 5: SPI, LED */ - P5SEL = 0x0E; /* Port5 Select: 00001110 = 0x0E */ - P5OUT = 0x70; /* Port5 Output: 01110000 = 0x70 */ - P5DIR = 0x70; /* Port5 Direction: 01110000 = 0x70 */ - - - P6SEL = 0xFF; /* Port6 Select: 11111111 = 0xFF */ - P6OUT = 0x00; /* Port6 Output: 00000000 = 0x00 */ - P6DIR = 0xFF; /* Port6 Direction: 11111000 = 0xF8 */ - -} - -static void msp430_init_cpuclk(uint8_t speed) -{ - /* stop watchdog */ - WDTCTL = WDTPW + WDTHOLD; - BCSCTL1 = RSEL2; - - /* wait for XTAL to stabilize */ - do { - /* clear oscillator fault flag */ - IFG1 &= ~OFIFG; - /* time for flag to set */ - for (uint16_t i = 0xFF; i > 0; i--) {} - } while ((IFG1 & OFIFG) != 0); - - /* apply clock config */ - BCSCTL2 = speed; -} - -void board_init(void) -{ - msp430_cpu_init(); - msb_ports_init(); - - /* initialize CPU clock */ - unsigned state = irq_disable(); - msp430_init_cpuclk(CLOCK_MODE); - irq_restore(state); - - /* initialize STDIO over UART */ - stdio_init(); -} diff --git a/boards/common/wsn430/include/board_common.h b/boards/common/wsn430/include/board_common.h deleted file mode 100644 index df4069c0def3..000000000000 --- a/boards/common/wsn430/include/board_common.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2013 Milan Babel - * 2015-2017 Freie Universität Berlin - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @defgroup boards_common_wsn430 Shared WSN430 files - * @ingroup boards_common - * @brief Common files for WSN430 based boards - * @{ - * - * @file - * @brief Common definitions for WSN430 based boards - * - * @author Milan Babel - * @author Hauke Petersen - * - */ - -#ifndef BOARD_COMMON_H -#define BOARD_COMMON_H - -#include "cpu.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @brief Address of the info memory - */ -#define INFOMEM (0x1000) - -/** - * @name Xtimer configuration - * @{ - */ -#define XTIMER_WIDTH (16) -#define XTIMER_BACKOFF (40) -/** @} */ - -/** - * @name LED pin definitions and handlers - * @{ - */ -#define LED0_PIN GPIO_PIN(4, 4) -#define LED1_PIN GPIO_PIN(4, 5) -#define LED2_PIN GPIO_PIN(4, 6) - -#define LED_DIR_REG P5DIR -#define LED0_MASK (1 << 4) -#define LED1_MASK (1 << 5) -#define LED2_MASK (1 << 6) - -#define LED0_ON (LED_DIR_REG &=~LED0_MASK) -#define LED0_OFF (LED_DIR_REG |= LED0_MASK) -#define LED0_TOGGLE (LED_DIR_REG ^= LED0_MASK) - -#define LED1_ON (LED_DIR_REG &=~LED1_MASK) -#define LED1_OFF (LED_DIR_REG |= LED1_MASK) -#define LED1_TOGGLE (LED_DIR_REG ^= LED1_MASK) - -#define LED2_ON (LED_DIR_REG &=~LED2_MASK) -#define LED2_OFF (LED_DIR_REG |= LED2_MASK) -#define LED2_TOGGLE (LED_DIR_REG ^= LED2_MASK) -/** @} */ - -#ifdef __cplusplus -} -#endif - -#endif /* BOARD_COMMON_H */ -/** @} */ diff --git a/boards/common/wsn430/include/periph_conf.h b/boards/common/wsn430/include/periph_conf.h deleted file mode 100644 index ff36261d9033..000000000000 --- a/boards/common/wsn430/include/periph_conf.h +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (C) 2014 INRIA - * 2015,2017 Freie Universität Berlin - * - * This file is subject to the terms and conditions of the GNU Lesser General - * Public License v2.1. See the file LICENSE in the top level directory for more - * details. - */ - -/** - * @ingroup boards_common_wsn430 - * @{ - * - * @file - * @brief WSN430 peripheral configuration - * - * @author Oliver Hahm - * @author Hauke Petersen - */ - -#ifndef PERIPH_CONF_H -#define PERIPH_CONF_H - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @name Clock configuration - * @{ - */ -#define CLOCK_CORECLOCK (8000000UL) -#define CLOCK_MODE (MCLK_8MHZ_SCLK_8MHZ) -#define CLOCK_CMCLK (CLOCK_CORECLOCK) /* no divider programmed */ -/** @} */ - -/** - * @name Timer configuration - * @{ - */ -#define TIMER_NUMOF (1U) -#define TIMER_BASE (TIMER_A) -#define TIMER_CHAN (3) -#define TIMER_ISR_CC0 (TIMERA0_VECTOR) -#define TIMER_ISR_CCX (TIMERA1_VECTOR) -/** @} */ - -/** - * @name UART configuration - * @{ - */ -#define UART_NUMOF (1U) -#define UART_0_EN (1U) - -#define UART_BASE (USART_0) -#define UART_IE (SFR->IE1) -#define UART_IF (SFR->IFG1) -#define UART_IE_RX_BIT (1 << 6) -#define UART_IE_TX_BIT (1 << 7) -#define UART_ME (SFR->ME1) -#define UART_ME_BITS (0xc0) -#define UART_PORT (PORT_3) -#define UART_RX_PIN (1 << 4) -#define UART_TX_PIN (1 << 5) -#define UART_RX_ISR (USART0RX_VECTOR) -#define UART_TX_ISR (USART0TX_VECTOR) -/** @} */ - -/** - * @name SPI configuration - * @{ - */ -#define SPI_NUMOF (1U) - -/* SPI configuration */ -#define SPI_BASE (USART_0) -#define SPI_IE (SFR->IE1) -#define SPI_IF (SFR->IFG1) -#define SPI_IE_RX_BIT (1 << 6) -#define SPI_IE_TX_BIT (1 << 7) -#define SPI_ME (SFR->ME1) -#define SPI_ME_BIT (1 << 6) -#define SPI_PIN_MISO GPIO_PIN(P5,2) -#define SPI_PIN_MOSI GPIO_PIN(P5,1) -#define SPI_PIN_CLK GPIO_PIN(P5,3) -/** @} */ - - -#ifdef __cplusplus -} -#endif - -#endif /* PERIPH_CONF_H */ -/** @} */ diff --git a/boards/wsn430-v1_3b/Kconfig b/boards/wsn430-v1_3b/Kconfig deleted file mode 100644 index 311e44cda46e..000000000000 --- a/boards/wsn430-v1_3b/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2020 HAW Hamburg -# -# This file is subject to the terms and conditions of the GNU Lesser -# General Public License v2.1. See the file LICENSE in the top level -# directory for more details. - -config BOARD - default "wsn430-v1_3b" if BOARD_WSN430_V1_3B - -config BOARD_WSN430_V1_3B - bool - default y - select BOARD_COMMON_WSN430 - -source "$(RIOTBOARD)/common/wsn430/Kconfig" diff --git a/boards/wsn430-v1_3b/Makefile b/boards/wsn430-v1_3b/Makefile deleted file mode 100644 index 3bf2d5cd3c8e..000000000000 --- a/boards/wsn430-v1_3b/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -MODULE = board -DIRS = $(RIOTBOARD)/common/wsn430 - -include $(RIOTBASE)/Makefile.base diff --git a/boards/wsn430-v1_3b/Makefile.dep b/boards/wsn430-v1_3b/Makefile.dep deleted file mode 100644 index 47da349b2285..000000000000 --- a/boards/wsn430-v1_3b/Makefile.dep +++ /dev/null @@ -1 +0,0 @@ -include $(RIOTBOARD)/common/wsn430/Makefile.dep diff --git a/boards/wsn430-v1_3b/Makefile.features b/boards/wsn430-v1_3b/Makefile.features deleted file mode 100644 index 41bb7f28639d..000000000000 --- a/boards/wsn430-v1_3b/Makefile.features +++ /dev/null @@ -1 +0,0 @@ -include $(RIOTBOARD)/common/wsn430/Makefile.features diff --git a/boards/wsn430-v1_3b/Makefile.include b/boards/wsn430-v1_3b/Makefile.include deleted file mode 100644 index e63bf64dd294..000000000000 --- a/boards/wsn430-v1_3b/Makefile.include +++ /dev/null @@ -1 +0,0 @@ -include $(RIOTBOARD)/common/wsn430/Makefile.include diff --git a/boards/wsn430-v1_3b/doc.txt b/boards/wsn430-v1_3b/doc.txt deleted file mode 100644 index a3b86f7a4972..000000000000 --- a/boards/wsn430-v1_3b/doc.txt +++ /dev/null @@ -1,5 +0,0 @@ -/** -@defgroup boards_wsn430-v1_3b WSN430 v1.3b -@ingroup boards -@brief Support for the Senslab WSN430 V1 Rev 3b - */ diff --git a/boards/wsn430-v1_3b/include/board.h b/boards/wsn430-v1_3b/include/board.h deleted file mode 100644 index 87413c954b6f..000000000000 --- a/boards/wsn430-v1_3b/include/board.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2018 Freie Universität Berlin - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @ingroup boards_wsn430-v1_3b - * @brief Support for the Senslab WSN430 v1.3b board - * - * @{ - * - * @file - * @brief Board specific definitions for the Senslab WSN430 v1.3b board - * - * @author Martine Lenders - */ -#ifndef BOARD_H -#define BOARD_H - -#include "board_common.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @name Define the interface to the CC1101 radio - * @{ - */ -#define CC110X_PARAM_CS (GPIO_PIN(P4, 2)) -#define CC110X_PARAM_GDO0 (GPIO_PIN(P1, 3)) -#define CC110X_PARAM_GDO1 (GPIO_PIN(P5, 2)) -#define CC110X_PARAM_GDO2 (GPIO_PIN(P1, 4)) -/** @} */ - -#ifdef __cplusplus -} -#endif - -#endif /* BOARD_H */ -/** @} */ diff --git a/boards/wsn430-v1_4/Kconfig b/boards/wsn430-v1_4/Kconfig deleted file mode 100644 index f8ef47deab80..000000000000 --- a/boards/wsn430-v1_4/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2020 HAW Hamburg -# -# This file is subject to the terms and conditions of the GNU Lesser -# General Public License v2.1. See the file LICENSE in the top level -# directory for more details. - -config BOARD - default "wsn430-v1_4" if BOARD_WSN430_V1_4 - -config BOARD_WSN430_V1_4 - bool - default y - select BOARD_COMMON_WSN430 - -source "$(RIOTBOARD)/common/wsn430/Kconfig" diff --git a/boards/wsn430-v1_4/Makefile b/boards/wsn430-v1_4/Makefile deleted file mode 100644 index 3bf2d5cd3c8e..000000000000 --- a/boards/wsn430-v1_4/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -MODULE = board -DIRS = $(RIOTBOARD)/common/wsn430 - -include $(RIOTBASE)/Makefile.base diff --git a/boards/wsn430-v1_4/Makefile.dep b/boards/wsn430-v1_4/Makefile.dep deleted file mode 100644 index 47da349b2285..000000000000 --- a/boards/wsn430-v1_4/Makefile.dep +++ /dev/null @@ -1 +0,0 @@ -include $(RIOTBOARD)/common/wsn430/Makefile.dep diff --git a/boards/wsn430-v1_4/Makefile.features b/boards/wsn430-v1_4/Makefile.features deleted file mode 100644 index 41bb7f28639d..000000000000 --- a/boards/wsn430-v1_4/Makefile.features +++ /dev/null @@ -1 +0,0 @@ -include $(RIOTBOARD)/common/wsn430/Makefile.features diff --git a/boards/wsn430-v1_4/Makefile.include b/boards/wsn430-v1_4/Makefile.include deleted file mode 100644 index e63bf64dd294..000000000000 --- a/boards/wsn430-v1_4/Makefile.include +++ /dev/null @@ -1 +0,0 @@ -include $(RIOTBOARD)/common/wsn430/Makefile.include diff --git a/boards/wsn430-v1_4/doc.txt b/boards/wsn430-v1_4/doc.txt deleted file mode 100644 index ec0ce158f7cf..000000000000 --- a/boards/wsn430-v1_4/doc.txt +++ /dev/null @@ -1,5 +0,0 @@ -/** -@defgroup boards_wsn430-v1_4 WSN430 v1.4 -@ingroup boards -@brief Support for the Senslab WSN430 V1 Rev 4 - */ diff --git a/boards/wsn430-v1_4/include/board.h b/boards/wsn430-v1_4/include/board.h deleted file mode 100644 index 4aaf534d38b7..000000000000 --- a/boards/wsn430-v1_4/include/board.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2018 Freie Universität Berlin - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @ingroup boards_wsn430-v1_4 - * @brief Support for the Senslab WSN430 v1.4 board - * - * @{ - * - * @file - * @brief Board specific definitions for the Senslab WSN430 v1.4 board - * - * @author Martine Lenders - */ -#ifndef BOARD_H -#define BOARD_H - -#include "board_common.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @name Define the interface to the CC2420 radio - * @{ - */ -#define CC2420_PARAMS_PIN_CS (GPIO_PIN(P4, 2)) -#define CC2420_PARAMS_PIN_FIFO (GPIO_PIN(P1, 3)) -#define CC2420_PARAMS_PIN_FIFOP (GPIO_PIN(P1, 4)) -#define CC2420_PARAMS_PIN_CCA (GPIO_PIN(P1, 6)) -#define CC2420_PARAMS_PIN_SFD (GPIO_PIN(P1, 5)) -#define CC2420_PARAMS_PIN_VREFEN (GPIO_PIN(P3, 0)) -#define CC2420_PARAMS_PIN_RESET (GPIO_PIN(P1, 7)) -/** @} */ - -#ifdef __cplusplus -} -#endif - -#endif /* BOARD_H */ -/** @} */ From 67843a2b11313f5a3f2fd918273b197670517cb9 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 10 Jul 2020 16:06:55 +0200 Subject: [PATCH 4/5] examples: test: remove remaining occurences of wsn430 --- examples/asymcute_mqttsn/Makefile.ci | 2 -- examples/cord_ep/Makefile.ci | 2 -- examples/cord_epsim/Makefile.ci | 2 -- examples/cord_lc/Makefile.ci | 2 -- examples/emcute_mqttsn/Makefile.ci | 2 -- examples/gcoap/Makefile.ci | 2 -- examples/gnrc_border_router/Makefile.ci | 2 -- examples/gnrc_lorawan/Makefile.ci | 2 -- examples/gnrc_networking/Makefile.ci | 2 -- examples/nanocoap_server/Makefile.ci | 2 -- examples/ndn-ping/Makefile.ci | 2 -- examples/posix_select/Makefile.ci | 2 -- examples/posix_sockets/Makefile.ci | 2 -- examples/suit_update/Makefile.ci | 2 -- tests/bench_xtimer/Makefile | 2 -- tests/bloom_bytes/Makefile.ci | 2 -- tests/conn_can/Makefile.ci | 2 -- tests/driver_bme680/Makefile.ci | 3 +-- tests/driver_cc110x/Makefile | 2 +- tests/driver_enc28j60/Makefile.ci | 2 -- tests/driver_encx24j600/Makefile.ci | 2 -- tests/driver_ltc4150/Makefile | 2 +- tests/driver_pulse_counter/Makefile | 2 +- tests/emb6/Makefile.ci | 2 -- tests/emcute/Makefile.ci | 2 -- tests/gnrc_dhcpv6_client/Makefile.ci | 2 -- tests/gnrc_dhcpv6_client_6lbr/Makefile.ci | 2 -- tests/gnrc_ipv6_ext/Makefile.ci | 2 -- tests/gnrc_ipv6_ext_frag/Makefile.ci | 2 -- tests/gnrc_ipv6_ext_opt/Makefile.ci | 2 -- tests/gnrc_ipv6_fwd_w_sub/Makefile.ci | 2 -- tests/gnrc_ipv6_nib/Makefile.ci | 2 -- tests/gnrc_ipv6_nib_6ln/Makefile.ci | 2 -- tests/gnrc_ipv6_nib_dns/Makefile.ci | 2 -- tests/gnrc_ndp/Makefile.ci | 2 -- tests/gnrc_netif/Makefile.ci | 2 -- tests/gnrc_rpl_p2p/Makefile.ci | 2 -- tests/gnrc_rpl_srh/Makefile.ci | 2 -- tests/gnrc_sixlowpan/Makefile.ci | 2 -- tests/gnrc_sixlowpan_iphc_w_vrb/Makefile.ci | 2 -- tests/gnrc_sock_dns/Makefile.ci | 2 -- tests/gnrc_tcp/Makefile.ci | 2 -- tests/gnrc_udp/Makefile.ci | 2 -- tests/kconfig_features/Makefile | 2 -- tests/periph_pm/Makefile | 2 +- tests/pkg_fatfs/Makefile | 2 +- tests/pkg_fatfs_vfs/Makefile.ci | 2 -- tests/pkg_libb2/Makefile.ci | 2 -- tests/pkg_libcoap/Makefile.ci | 2 -- tests/pkg_littlefs/Makefile | 2 -- tests/pkg_minmea/Makefile | 2 +- tests/pkg_relic/Makefile | 2 -- tests/pkg_spiffs/Makefile.ci | 2 -- tests/pkg_tiny-asn1/Makefile | 2 -- tests/pkg_u8g2/Makefile.ci | 2 -- tests/ps_schedstatistics/Makefile.ci | 2 -- tests/riotboot_flashwrite/Makefile.ci | 2 -- tests/sntp/Makefile.ci | 2 -- tests/struct_tm_utility/Makefile | 2 +- tests/suit_manifest/Makefile.ci | 2 -- tests/sys_crypto/Makefile.ci | 2 -- tests/unittests/Makefile.ci | 2 -- 62 files changed, 8 insertions(+), 117 deletions(-) diff --git a/examples/asymcute_mqttsn/Makefile.ci b/examples/asymcute_mqttsn/Makefile.ci index c0e80fe3bf23..aaf48eef5b8e 100644 --- a/examples/asymcute_mqttsn/Makefile.ci +++ b/examples/asymcute_mqttsn/Makefile.ci @@ -37,8 +37,6 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ yunjia-nrf51822 \ z1 \ # diff --git a/examples/cord_ep/Makefile.ci b/examples/cord_ep/Makefile.ci index 4f5b594b6951..0a4e468c2fc7 100644 --- a/examples/cord_ep/Makefile.ci +++ b/examples/cord_ep/Makefile.ci @@ -28,7 +28,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/examples/cord_epsim/Makefile.ci b/examples/cord_epsim/Makefile.ci index 7bdd29d34f4f..71e60097606a 100644 --- a/examples/cord_epsim/Makefile.ci +++ b/examples/cord_epsim/Makefile.ci @@ -25,7 +25,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/examples/cord_lc/Makefile.ci b/examples/cord_lc/Makefile.ci index 4f5b594b6951..0a4e468c2fc7 100644 --- a/examples/cord_lc/Makefile.ci +++ b/examples/cord_lc/Makefile.ci @@ -28,7 +28,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/examples/emcute_mqttsn/Makefile.ci b/examples/emcute_mqttsn/Makefile.ci index 6323005cdf57..d1e0409c6eea 100644 --- a/examples/emcute_mqttsn/Makefile.ci +++ b/examples/emcute_mqttsn/Makefile.ci @@ -31,7 +31,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/examples/gcoap/Makefile.ci b/examples/gcoap/Makefile.ci index fdd44d607015..62d13896068f 100644 --- a/examples/gcoap/Makefile.ci +++ b/examples/gcoap/Makefile.ci @@ -25,7 +25,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/examples/gnrc_border_router/Makefile.ci b/examples/gnrc_border_router/Makefile.ci index 2e0aabdc290a..60f5bc821480 100644 --- a/examples/gnrc_border_router/Makefile.ci +++ b/examples/gnrc_border_router/Makefile.ci @@ -53,8 +53,6 @@ BOARD_INSUFFICIENT_MEMORY := \ telosb \ waspmote-pro \ weio \ - wsn430-v1_3b \ - wsn430-v1_4 \ yunjia-nrf51822 \ z1 \ # diff --git a/examples/gnrc_lorawan/Makefile.ci b/examples/gnrc_lorawan/Makefile.ci index 6deb8724c9fb..6132e54c8489 100644 --- a/examples/gnrc_lorawan/Makefile.ci +++ b/examples/gnrc_lorawan/Makefile.ci @@ -14,7 +14,5 @@ BOARD_INSUFFICIENT_MEMORY := \ msb-430h \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/examples/gnrc_networking/Makefile.ci b/examples/gnrc_networking/Makefile.ci index 75b6d41b8bef..f4834ec12de3 100644 --- a/examples/gnrc_networking/Makefile.ci +++ b/examples/gnrc_networking/Makefile.ci @@ -39,7 +39,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/examples/nanocoap_server/Makefile.ci b/examples/nanocoap_server/Makefile.ci index 6166ac1d8b63..1359f3bc3d85 100644 --- a/examples/nanocoap_server/Makefile.ci +++ b/examples/nanocoap_server/Makefile.ci @@ -22,7 +22,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/examples/ndn-ping/Makefile.ci b/examples/ndn-ping/Makefile.ci index 1dfd1d767276..ec87d82976e6 100644 --- a/examples/ndn-ping/Makefile.ci +++ b/examples/ndn-ping/Makefile.ci @@ -24,7 +24,5 @@ BOARD_INSUFFICIENT_MEMORY := \ telosb \ waspmote-pro \ weio \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/examples/posix_select/Makefile.ci b/examples/posix_select/Makefile.ci index 981a790ea3a7..026e6152c662 100644 --- a/examples/posix_select/Makefile.ci +++ b/examples/posix_select/Makefile.ci @@ -21,7 +21,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/examples/posix_sockets/Makefile.ci b/examples/posix_sockets/Makefile.ci index 5758fc8600a0..42cffc6aa95f 100644 --- a/examples/posix_sockets/Makefile.ci +++ b/examples/posix_sockets/Makefile.ci @@ -32,8 +32,6 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ yunjia-nrf51822 \ z1 \ # diff --git a/examples/suit_update/Makefile.ci b/examples/suit_update/Makefile.ci index 8eacbcf2ac30..1719fab88083 100644 --- a/examples/suit_update/Makefile.ci +++ b/examples/suit_update/Makefile.ci @@ -24,7 +24,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32f0discovery \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/bench_xtimer/Makefile b/tests/bench_xtimer/Makefile index 57716d17034c..e010ff592172 100644 --- a/tests/bench_xtimer/Makefile +++ b/tests/bench_xtimer/Makefile @@ -62,8 +62,6 @@ LOW_MEMORY_BOARDS += \ telosb \ waspmote-pro \ wemos-zero \ - wsn430-v1_3b \ - wsn430-v1_4 \ yunjia-nrf51822 \ z1 \ # diff --git a/tests/bloom_bytes/Makefile.ci b/tests/bloom_bytes/Makefile.ci index e0852192c885..853e4b4c406f 100644 --- a/tests/bloom_bytes/Makefile.ci +++ b/tests/bloom_bytes/Makefile.ci @@ -9,7 +9,5 @@ BOARD_INSUFFICIENT_MEMORY := \ msb-430h \ stm32f030f4-demo \ telosb \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/conn_can/Makefile.ci b/tests/conn_can/Makefile.ci index f37aceb242a6..c552366da51f 100644 --- a/tests/conn_can/Makefile.ci +++ b/tests/conn_can/Makefile.ci @@ -35,8 +35,6 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ yunjia-nrf51822 \ z1 \ # diff --git a/tests/driver_bme680/Makefile.ci b/tests/driver_bme680/Makefile.ci index e3954f4bd640..69024039a177 100644 --- a/tests/driver_bme680/Makefile.ci +++ b/tests/driver_bme680/Makefile.ci @@ -6,6 +6,5 @@ BOARD_INSUFFICIENT_MEMORY := \ msb-430h \ nucleo-f031k6 \ telosb \ - wsn430-v1_3b \ - wsn430-v1_4 z1 \ + z1 \ # diff --git a/tests/driver_cc110x/Makefile b/tests/driver_cc110x/Makefile index 2f3ed49a409e..33f91d32b9ef 100644 --- a/tests/driver_cc110x/Makefile +++ b/tests/driver_cc110x/Makefile @@ -4,7 +4,7 @@ include ../Makefile.tests_common DEVICE ?= cc1100 # The MSB-A2 uses the CC1100. New boards use CC1101 # stdlib.h for msp430 does not provide EXIT_FAILURE and EXIT_SUCCESS -BOARD_BLACKLIST += msb-430 msb-430h telosb wsn430-v1_3b wsn430-v1_4 z1 +BOARD_BLACKLIST += msb-430 msb-430h telosb z1 # This test will rely on a human interacting with the shell, so we better add # the shell and some commands diff --git a/tests/driver_enc28j60/Makefile.ci b/tests/driver_enc28j60/Makefile.ci index 9c78ecad0d88..777c20adff10 100644 --- a/tests/driver_enc28j60/Makefile.ci +++ b/tests/driver_enc28j60/Makefile.ci @@ -23,7 +23,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/driver_encx24j600/Makefile.ci b/tests/driver_encx24j600/Makefile.ci index e58fe9960f5c..119f53633361 100644 --- a/tests/driver_encx24j600/Makefile.ci +++ b/tests/driver_encx24j600/Makefile.ci @@ -17,7 +17,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/driver_ltc4150/Makefile b/tests/driver_ltc4150/Makefile index bf943536b37e..bef429786491 100644 --- a/tests/driver_ltc4150/Makefile +++ b/tests/driver_ltc4150/Makefile @@ -7,6 +7,6 @@ USEMODULE += ltc4150 include $(RIOTBASE)/Makefile.include -ifneq (,$(filter $(BOARD),msb-430 msb-430h telosb wsn430-v1_3b wsn430-v1_4 z1)) +ifneq (,$(filter $(BOARD),msb-430 msb-430h telosb z1)) CFLAGS += -DNO_FPUTS endif diff --git a/tests/driver_pulse_counter/Makefile b/tests/driver_pulse_counter/Makefile index b9280954a7b4..44b831d771a9 100644 --- a/tests/driver_pulse_counter/Makefile +++ b/tests/driver_pulse_counter/Makefile @@ -1,6 +1,6 @@ include ../Makefile.tests_common -BOARD_BLACKLIST := msb-430 msb-430h telosb wsn430-v1_3b wsn430-v1_4 z1 +BOARD_BLACKLIST := msb-430 msb-430h telosb z1 USEMODULE += pulse_counter diff --git a/tests/emb6/Makefile.ci b/tests/emb6/Makefile.ci index e58fe9960f5c..119f53633361 100644 --- a/tests/emb6/Makefile.ci +++ b/tests/emb6/Makefile.ci @@ -17,7 +17,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/emcute/Makefile.ci b/tests/emcute/Makefile.ci index 4ce17f892e99..62c51016f596 100644 --- a/tests/emcute/Makefile.ci +++ b/tests/emcute/Makefile.ci @@ -50,8 +50,6 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ yunjia-nrf51822 \ z1 \ # diff --git a/tests/gnrc_dhcpv6_client/Makefile.ci b/tests/gnrc_dhcpv6_client/Makefile.ci index 1200a95c523d..5b7647ceb2bd 100644 --- a/tests/gnrc_dhcpv6_client/Makefile.ci +++ b/tests/gnrc_dhcpv6_client/Makefile.ci @@ -31,7 +31,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/gnrc_dhcpv6_client_6lbr/Makefile.ci b/tests/gnrc_dhcpv6_client_6lbr/Makefile.ci index 45dbc236af29..93065853199c 100644 --- a/tests/gnrc_dhcpv6_client_6lbr/Makefile.ci +++ b/tests/gnrc_dhcpv6_client_6lbr/Makefile.ci @@ -51,8 +51,6 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ yunjia-nrf51822 \ z1 \ # diff --git a/tests/gnrc_ipv6_ext/Makefile.ci b/tests/gnrc_ipv6_ext/Makefile.ci index 8cecc43560a6..6b1a633a7a07 100644 --- a/tests/gnrc_ipv6_ext/Makefile.ci +++ b/tests/gnrc_ipv6_ext/Makefile.ci @@ -32,7 +32,5 @@ BOARD_INSUFFICIENT_MEMORY := \ telosb \ thingy52 \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/gnrc_ipv6_ext_frag/Makefile.ci b/tests/gnrc_ipv6_ext_frag/Makefile.ci index af7665a9caae..067b5e3cf32c 100644 --- a/tests/gnrc_ipv6_ext_frag/Makefile.ci +++ b/tests/gnrc_ipv6_ext_frag/Makefile.ci @@ -34,7 +34,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/gnrc_ipv6_ext_opt/Makefile.ci b/tests/gnrc_ipv6_ext_opt/Makefile.ci index ee88afc3a3cd..c649354120dc 100644 --- a/tests/gnrc_ipv6_ext_opt/Makefile.ci +++ b/tests/gnrc_ipv6_ext_opt/Makefile.ci @@ -24,7 +24,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/gnrc_ipv6_fwd_w_sub/Makefile.ci b/tests/gnrc_ipv6_fwd_w_sub/Makefile.ci index f4f4d48c8111..036e1fa90c07 100644 --- a/tests/gnrc_ipv6_fwd_w_sub/Makefile.ci +++ b/tests/gnrc_ipv6_fwd_w_sub/Makefile.ci @@ -19,7 +19,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/gnrc_ipv6_nib/Makefile.ci b/tests/gnrc_ipv6_nib/Makefile.ci index cd21fe494b1f..b6a87f851bd8 100644 --- a/tests/gnrc_ipv6_nib/Makefile.ci +++ b/tests/gnrc_ipv6_nib/Makefile.ci @@ -14,7 +14,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32f030f4-demo \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/gnrc_ipv6_nib_6ln/Makefile.ci b/tests/gnrc_ipv6_nib_6ln/Makefile.ci index f4f4d48c8111..036e1fa90c07 100644 --- a/tests/gnrc_ipv6_nib_6ln/Makefile.ci +++ b/tests/gnrc_ipv6_nib_6ln/Makefile.ci @@ -19,7 +19,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/gnrc_ipv6_nib_dns/Makefile.ci b/tests/gnrc_ipv6_nib_dns/Makefile.ci index af68750ef4a8..ed2a4eaf7cd4 100644 --- a/tests/gnrc_ipv6_nib_dns/Makefile.ci +++ b/tests/gnrc_ipv6_nib_dns/Makefile.ci @@ -23,6 +23,4 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ # diff --git a/tests/gnrc_ndp/Makefile.ci b/tests/gnrc_ndp/Makefile.ci index f4f4d48c8111..036e1fa90c07 100644 --- a/tests/gnrc_ndp/Makefile.ci +++ b/tests/gnrc_ndp/Makefile.ci @@ -19,7 +19,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/gnrc_netif/Makefile.ci b/tests/gnrc_netif/Makefile.ci index 71b0fec138ab..f7cccf26e904 100644 --- a/tests/gnrc_netif/Makefile.ci +++ b/tests/gnrc_netif/Makefile.ci @@ -53,8 +53,6 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ yunjia-nrf51822 \ z1 \ # diff --git a/tests/gnrc_rpl_p2p/Makefile.ci b/tests/gnrc_rpl_p2p/Makefile.ci index 6e67c40e467e..b18d67608820 100644 --- a/tests/gnrc_rpl_p2p/Makefile.ci +++ b/tests/gnrc_rpl_p2p/Makefile.ci @@ -25,7 +25,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/gnrc_rpl_srh/Makefile.ci b/tests/gnrc_rpl_srh/Makefile.ci index 03303ad3becd..0e3b1c77a833 100644 --- a/tests/gnrc_rpl_srh/Makefile.ci +++ b/tests/gnrc_rpl_srh/Makefile.ci @@ -32,7 +32,5 @@ BOARD_INSUFFICIENT_MEMORY := \ telosb \ thingy52 \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/gnrc_sixlowpan/Makefile.ci b/tests/gnrc_sixlowpan/Makefile.ci index 4cb07f4ca1e4..93b3cbd496be 100644 --- a/tests/gnrc_sixlowpan/Makefile.ci +++ b/tests/gnrc_sixlowpan/Makefile.ci @@ -28,7 +28,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/gnrc_sixlowpan_iphc_w_vrb/Makefile.ci b/tests/gnrc_sixlowpan_iphc_w_vrb/Makefile.ci index 01875ac7530c..d79229066829 100644 --- a/tests/gnrc_sixlowpan_iphc_w_vrb/Makefile.ci +++ b/tests/gnrc_sixlowpan_iphc_w_vrb/Makefile.ci @@ -19,6 +19,4 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ # diff --git a/tests/gnrc_sock_dns/Makefile.ci b/tests/gnrc_sock_dns/Makefile.ci index dd0039157fbf..277ad3a12f72 100644 --- a/tests/gnrc_sock_dns/Makefile.ci +++ b/tests/gnrc_sock_dns/Makefile.ci @@ -27,7 +27,5 @@ BOARD_INSUFFICIENT_MEMORY := \ telosb \ thingy52 \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/gnrc_tcp/Makefile.ci b/tests/gnrc_tcp/Makefile.ci index 1200a95c523d..5b7647ceb2bd 100644 --- a/tests/gnrc_tcp/Makefile.ci +++ b/tests/gnrc_tcp/Makefile.ci @@ -31,7 +31,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/gnrc_udp/Makefile.ci b/tests/gnrc_udp/Makefile.ci index 69ee200e1ee7..62b5917685ea 100644 --- a/tests/gnrc_udp/Makefile.ci +++ b/tests/gnrc_udp/Makefile.ci @@ -42,8 +42,6 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ yunjia-nrf51822 \ z1 \ # diff --git a/tests/kconfig_features/Makefile b/tests/kconfig_features/Makefile index bb39e0424458..34b282352435 100644 --- a/tests/kconfig_features/Makefile +++ b/tests/kconfig_features/Makefile @@ -61,8 +61,6 @@ BOARD_WHITELIST += arduino-duemilanove \ telosb \ usb-kw41z \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 # diff --git a/tests/periph_pm/Makefile b/tests/periph_pm/Makefile index f8ca0371e745..a9e491c716b4 100644 --- a/tests/periph_pm/Makefile +++ b/tests/periph_pm/Makefile @@ -2,7 +2,7 @@ BOARD ?= slstk3401a include ../Makefile.tests_common # method `fflush()` is not defined for MSP-430 (#6445 will fix this) -BOARD_BLACKLIST := chronos msb-430h msb-430 telosb wsn430-v1_3b wsn430-v1_4 z1 +BOARD_BLACKLIST := chronos msb-430h msb-430 telosb z1 FEATURES_OPTIONAL += periph_rtc FEATURES_OPTIONAL += periph_gpio_irq diff --git a/tests/pkg_fatfs/Makefile b/tests/pkg_fatfs/Makefile index b6c3a7d5f605..d6923a5f88d1 100644 --- a/tests/pkg_fatfs/Makefile +++ b/tests/pkg_fatfs/Makefile @@ -23,7 +23,7 @@ BOARD_WHITELIST := airfy-beacon arduino-due arduino-duemilanove \ sensebox_samd21 sltb001a sodaq-autonomo \ sodaq-explorer spark-core stm32f0discovery stm32f3discovery \ stm32f4discovery stm32l0538-disco telosb udoo waspmote-pro \ - wsn430-v1_3b wsn430-v1_4 yunjia-nrf51822 z1 native + yunjia-nrf51822 z1 native USEMODULE += shell USEMODULE += fatfs_diskio_mtd diff --git a/tests/pkg_fatfs_vfs/Makefile.ci b/tests/pkg_fatfs_vfs/Makefile.ci index 52c66d646877..41426e51eac6 100644 --- a/tests/pkg_fatfs_vfs/Makefile.ci +++ b/tests/pkg_fatfs_vfs/Makefile.ci @@ -10,7 +10,5 @@ BOARD_INSUFFICIENT_MEMORY := \ nucleo-f042k6 \ stm32f030f4-demo \ telosb \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/pkg_libb2/Makefile.ci b/tests/pkg_libb2/Makefile.ci index 6ed3d84302fa..247d5816456f 100644 --- a/tests/pkg_libb2/Makefile.ci +++ b/tests/pkg_libb2/Makefile.ci @@ -19,7 +19,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32f030f4-demo \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/pkg_libcoap/Makefile.ci b/tests/pkg_libcoap/Makefile.ci index ade565cb4c53..72eebfa8aa0d 100644 --- a/tests/pkg_libcoap/Makefile.ci +++ b/tests/pkg_libcoap/Makefile.ci @@ -15,7 +15,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32f0discovery \ stm32l0538-disco \ telosb \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/pkg_littlefs/Makefile b/tests/pkg_littlefs/Makefile index 72841457a96b..ee807125e50c 100644 --- a/tests/pkg_littlefs/Makefile +++ b/tests/pkg_littlefs/Makefile @@ -4,8 +4,6 @@ BOARD_BLACKLIST := chronos \ msb-430 \ msb-430h \ telosb \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ USEMODULE += littlefs diff --git a/tests/pkg_minmea/Makefile b/tests/pkg_minmea/Makefile index dcc5ddcbaad8..5e5594bba28d 100644 --- a/tests/pkg_minmea/Makefile +++ b/tests/pkg_minmea/Makefile @@ -5,6 +5,6 @@ USEPKG += minmea USEMODULE += fmt # The MSP-430 toolchain lacks mktime and NAN -BOARD_BLACKLIST := chronos msb-430 msb-430h telosb wsn430-v1_3b wsn430-v1_4 z1 +BOARD_BLACKLIST := chronos msb-430 msb-430h telosb z1 include $(RIOTBASE)/Makefile.include diff --git a/tests/pkg_relic/Makefile b/tests/pkg_relic/Makefile index 12097fb0c14d..465bbbe517d0 100644 --- a/tests/pkg_relic/Makefile +++ b/tests/pkg_relic/Makefile @@ -24,8 +24,6 @@ BOARD_BLACKLIST := arduino-duemilanove \ stm32f3discovery \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/pkg_spiffs/Makefile.ci b/tests/pkg_spiffs/Makefile.ci index b2deab81790c..3e9b0ab61c68 100644 --- a/tests/pkg_spiffs/Makefile.ci +++ b/tests/pkg_spiffs/Makefile.ci @@ -17,7 +17,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32f0discovery \ stm32l0538-disco \ telosb \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/pkg_tiny-asn1/Makefile b/tests/pkg_tiny-asn1/Makefile index abacd9e7596b..21818d54b802 100644 --- a/tests/pkg_tiny-asn1/Makefile +++ b/tests/pkg_tiny-asn1/Makefile @@ -1,7 +1,5 @@ include ../Makefile.tests_common -BOARD_BLACKLIST := wsn430-v1_3b wsn430-v1_4 - USEPKG += tiny-asn1 include $(RIOTBASE)/Makefile.include diff --git a/tests/pkg_u8g2/Makefile.ci b/tests/pkg_u8g2/Makefile.ci index 880528ac146f..2adc480aed1c 100644 --- a/tests/pkg_u8g2/Makefile.ci +++ b/tests/pkg_u8g2/Makefile.ci @@ -10,7 +10,5 @@ BOARD_INSUFFICIENT_MEMORY := \ nucleo-f031k6 \ stm32f030f4-demo \ telosb \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/ps_schedstatistics/Makefile.ci b/tests/ps_schedstatistics/Makefile.ci index b2deab81790c..3e9b0ab61c68 100644 --- a/tests/ps_schedstatistics/Makefile.ci +++ b/tests/ps_schedstatistics/Makefile.ci @@ -17,7 +17,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32f0discovery \ stm32l0538-disco \ telosb \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/riotboot_flashwrite/Makefile.ci b/tests/riotboot_flashwrite/Makefile.ci index d4962acaf038..974a71240f36 100644 --- a/tests/riotboot_flashwrite/Makefile.ci +++ b/tests/riotboot_flashwrite/Makefile.ci @@ -21,7 +21,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32f0discovery \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/sntp/Makefile.ci b/tests/sntp/Makefile.ci index 0302a86029cf..3dd75f183d1d 100644 --- a/tests/sntp/Makefile.ci +++ b/tests/sntp/Makefile.ci @@ -23,7 +23,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/struct_tm_utility/Makefile b/tests/struct_tm_utility/Makefile index adaf43d075bf..559d535970a4 100644 --- a/tests/struct_tm_utility/Makefile +++ b/tests/struct_tm_utility/Makefile @@ -4,6 +4,6 @@ USEMODULE += shell USEMODULE += timex # The MSP-430 toolchain lacks sscanf: -BOARD_BLACKLIST := chronos msb-430 msb-430h telosb wsn430-v1_3b wsn430-v1_4 z1 +BOARD_BLACKLIST := chronos msb-430 msb-430h telosb z1 include $(RIOTBASE)/Makefile.include diff --git a/tests/suit_manifest/Makefile.ci b/tests/suit_manifest/Makefile.ci index 29fd972f2411..76bf61e2ef6f 100644 --- a/tests/suit_manifest/Makefile.ci +++ b/tests/suit_manifest/Makefile.ci @@ -11,7 +11,5 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32l0538-disco \ stm32f0discovery \ telosb \ - wsn430-v1_3b \ - wsn430-v1_4 \ z1 \ # diff --git a/tests/sys_crypto/Makefile.ci b/tests/sys_crypto/Makefile.ci index 2ecfc5b95b04..cf165d892553 100644 --- a/tests/sys_crypto/Makefile.ci +++ b/tests/sys_crypto/Makefile.ci @@ -12,6 +12,4 @@ BOARD_INSUFFICIENT_MEMORY := \ stm32f030f4-demo \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ # diff --git a/tests/unittests/Makefile.ci b/tests/unittests/Makefile.ci index ef737ce1cc70..0aa1c54a3059 100644 --- a/tests/unittests/Makefile.ci +++ b/tests/unittests/Makefile.ci @@ -94,8 +94,6 @@ BOARD_INSUFFICIENT_MEMORY := \ teensy31 \ telosb \ waspmote-pro \ - wsn430-v1_3b \ - wsn430-v1_4 \ yunjia-nrf51822 \ z1 \ # From 5555dd3a97211b4df3b470eef200727945cf1e24 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 10 Jul 2020 16:08:22 +0200 Subject: [PATCH 5/5] tests/float: adapt comment for msp430 about increased timeout --- tests/float/tests/01-run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/float/tests/01-run.py b/tests/float/tests/01-run.py index 4a3ef32f0a3b..a20a7b711a42 100755 --- a/tests/float/tests/01-run.py +++ b/tests/float/tests/01-run.py @@ -9,7 +9,7 @@ import sys from testrunner import run -# It takes 35 seconds on wsn430, so add some margin +# It takes 35 seconds on msp430, so add some margin TIMEOUT = 45