From 9447cb303426d7c6348bb84999f88bf929cd6263 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Thu, 9 Nov 2017 12:13:00 +0100 Subject: [PATCH 1/4] boards: removed support for pca10000 --- boards/pca10000/Makefile | 3 - boards/pca10000/Makefile.dep | 3 - boards/pca10000/Makefile.features | 13 ---- boards/pca10000/Makefile.include | 15 ---- boards/pca10000/board.c | 33 -------- boards/pca10000/include/board.h | 74 ------------------ boards/pca10000/include/periph_conf.h | 105 -------------------------- 7 files changed, 246 deletions(-) delete mode 100644 boards/pca10000/Makefile delete mode 100644 boards/pca10000/Makefile.dep delete mode 100644 boards/pca10000/Makefile.features delete mode 100644 boards/pca10000/Makefile.include delete mode 100644 boards/pca10000/board.c delete mode 100644 boards/pca10000/include/board.h delete mode 100644 boards/pca10000/include/periph_conf.h diff --git a/boards/pca10000/Makefile b/boards/pca10000/Makefile deleted file mode 100644 index f8fcbb53a0..0000000000 --- a/boards/pca10000/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -MODULE = board - -include $(RIOTBASE)/Makefile.base diff --git a/boards/pca10000/Makefile.dep b/boards/pca10000/Makefile.dep deleted file mode 100644 index 7de44689f6..0000000000 --- a/boards/pca10000/Makefile.dep +++ /dev/null @@ -1,3 +0,0 @@ -ifneq (,$(filter gnrc_netdev_default netdev_default,$(USEMODULE))) - USEMODULE += nrfmin -endif diff --git a/boards/pca10000/Makefile.features b/boards/pca10000/Makefile.features deleted file mode 100644 index 4e544b60b1..0000000000 --- a/boards/pca10000/Makefile.features +++ /dev/null @@ -1,13 +0,0 @@ -# Put defined MCU peripherals here (in alphabetical order) -FEATURES_PROVIDED += periph_gpio -FEATURES_PROVIDED += periph_rtt -FEATURES_PROVIDED += periph_timer -FEATURES_PROVIDED += periph_uart - -# Various other features (if any) -FEATURES_PROVIDED += radio_nrfmin - -# The board MPU family (used for grouping by the CI system) -FEATURES_MCU_GROUP = cortex_m0_2 - --include $(RIOTCPU)/nrf51/Makefile.features diff --git a/boards/pca10000/Makefile.include b/boards/pca10000/Makefile.include deleted file mode 100644 index 55826907c0..0000000000 --- a/boards/pca10000/Makefile.include +++ /dev/null @@ -1,15 +0,0 @@ -# define the used CPU -export CPU = nrf51 -export CPU_MODEL = nrf51x22xxaa - -# define the default port depending on the host OS -PORT_LINUX ?= /dev/ttyACM0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) - -# setup JLink for flashing -export JLINK_DEVICE := nrf51822 -export JLINK_PRE_FLASH := w4 4001e504 1 -include $(RIOTMAKE)/tools/jlink.inc.mk - -# setup serial terminal -include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/pca10000/board.c b/boards/pca10000/board.c deleted file mode 100644 index 289b26cde8..0000000000 --- a/boards/pca10000/board.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2014-2015 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_pca10000 - * @{ - * - * @file - * @brief Board initialization code for the Nordic PCA10000 board - * - * @author Christian Kühling - * @author Timo Ziegler - * - * @} - */ - -#include "cpu.h" -#include "board.h" - -void board_init(void) -{ - /* initialize the boards LEDs: set pins to output and turn LEDs off */ - NRF_GPIO->DIRSET = (LED0_MASK | LED1_MASK | LED2_MASK); - NRF_GPIO->OUTSET = (LED0_MASK | LED1_MASK | LED2_MASK); - - /* trigger the CPU initialization code */ - cpu_init(); -} diff --git a/boards/pca10000/include/board.h b/boards/pca10000/include/board.h deleted file mode 100644 index 9fd5860333..0000000000 --- a/boards/pca10000/include/board.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2014-2015 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_pca10000 Nordic PCA10000 - * @ingroup boards - * @brief Board specific files for the Nordic PCA100000 - * @{ - * - * @file - * @brief Board configuration for the Nordic PCA10000 board - * - * @author Christian Kühling - * @author Timo Ziegler - */ - -#ifndef BOARD_H -#define BOARD_H - -#include "cpu.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @name Xtimer configuration - * @{ - */ -#define XTIMER_WIDTH (24) -#define XTIMER_BACKOFF (40) -/** @} */ - -/** - * @name LED pin definitions and handlers - * @{ - */ -#define LED0_PIN GPIO_PIN(0, 21) -#define LED1_PIN GPIO_PIN(0, 22) -#define LED2_PIN GPIO_PIN(0, 23) - -#define LED0_MASK (1 << 21) -#define LED1_MASK (1 << 22) -#define LED2_MASK (1 << 23) - -#define LED0_ON (NRF_GPIO->OUTCLR = LED0_MASK) -#define LED0_OFF (NRF_GPIO->OUTSET = LED0_MASK) -#define LED0_TOGGLE (NRF_GPIO->OUT ^= LED0_MASK) - -#define LED1_ON (NRF_GPIO->OUTCLR = LED1_MASK) -#define LED1_OFF (NRF_GPIO->OUTSET = LED1_MASK) -#define LED1_TOGGLE (NRF_GPIO->OUT ^= LED1_MASK) - -#define LED2_ON (NRF_GPIO->OUTCLR = LED2_MASK) -#define LED2_OFF (NRF_GPIO->OUTSET = LED2_MASK) -#define LED2_TOGGLE (NRF_GPIO->OUT ^= LED2_MASK) -/** @} */ - -/** - * @brief Initialize the board, including triggering the CPU initialization - */ -void board_init(void); - -#ifdef __cplusplus -} -#endif - -#endif /* BOARD_H */ -/** @} */ diff --git a/boards/pca10000/include/periph_conf.h b/boards/pca10000/include/periph_conf.h deleted file mode 100644 index 64c4a7e2e1..0000000000 --- a/boards/pca10000/include/periph_conf.h +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (C) 2014 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_pca10000 - * @{ - * - * @file - * @brief Peripheral MCU configuration for the nRF51822 board pca10000 - * - * @author Christian Kühling - * @author Timo Ziegler - * @author Hauke Petersen - */ - -#ifndef PERIPH_CONF_H -#define PERIPH_CONF_H - -#include "periph_cpu.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @name Clock configuration - * - * @note The radio will not work with the internal RC oscillator! - * - * @{ - */ -#define CLOCK_HFCLK (16U) /* set to 0: internal RC oscillator - 16: 16MHz crystal - 32: 32MHz crystal */ -#define CLOCK_LFCLK (0) /* set to 0: internal RC oscillator - * 1: 32.768 kHz crystal - * 2: derived from HFCLK */ -/** @} */ - -/** - * @name Timer configuration - * @{ - */ -static const timer_conf_t timer_config[] = { - /* dev, channels, width */ - { NRF_TIMER0, 3, TIMER_BITMODE_BITMODE_24Bit, TIMER0_IRQn } -}; - -#define TIMER_0_ISR isr_timer0 - -#define TIMER_NUMOF (sizeof(timer_config) / sizeof(timer_config[0])) -/** @} */ - -/** - * @name Real time counter configuration - * @{ - */ -#define RTT_NUMOF (1U) -#define RTT_DEV (1) /* NRF_RTC1 */ -#define RTT_MAX_VALUE (0x00ffffff) -#define RTT_FREQUENCY (1024) -/** @} */ - -/** - * @name UART configuration - * @{ - */ -#define UART_NUMOF (1U) -/* UART pin configuration */ -#define UART_HWFLOWCTRL 1 -#define UART_PIN_RX 11 -#define UART_PIN_TX 9 -#define UART_PIN_RTS 8 -#define UART_PIN_CTS 10 -/** @} */ - -/** - * @name ADC configuration - * - * The configuration consists simply of a list of channels that should be used - * @{ - */ -#define ADC_NUMOF (0) -/** @} */ - -/** - * @name Radio device configuration - * - * The radio is not guarded by a NUMOF define, as the radio is selected by its - * own module in the build system. - * @{ - */ -#define RADIO_IRQ_PRIO 1 -/** @} */ - -#ifdef __cplusplus -} -#endif - -#endif /* PERIPH_CONF_H */ From ea73cc49eacd45640b9660134c4c92b887cb2716 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Thu, 9 Nov 2017 12:13:32 +0100 Subject: [PATCH 2/4] boards: removed support for pca10005 --- boards/pca10005/Makefile | 3 - boards/pca10005/Makefile.dep | 3 - boards/pca10005/Makefile.features | 15 ---- boards/pca10005/Makefile.include | 15 ---- boards/pca10005/board.c | 30 ------- boards/pca10005/include/board.h | 49 ---------- boards/pca10005/include/periph_conf.h | 125 -------------------------- 7 files changed, 240 deletions(-) delete mode 100644 boards/pca10005/Makefile delete mode 100644 boards/pca10005/Makefile.dep delete mode 100644 boards/pca10005/Makefile.features delete mode 100644 boards/pca10005/Makefile.include delete mode 100644 boards/pca10005/board.c delete mode 100644 boards/pca10005/include/board.h delete mode 100644 boards/pca10005/include/periph_conf.h diff --git a/boards/pca10005/Makefile b/boards/pca10005/Makefile deleted file mode 100644 index f8fcbb53a0..0000000000 --- a/boards/pca10005/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -MODULE = board - -include $(RIOTBASE)/Makefile.base diff --git a/boards/pca10005/Makefile.dep b/boards/pca10005/Makefile.dep deleted file mode 100644 index 7de44689f6..0000000000 --- a/boards/pca10005/Makefile.dep +++ /dev/null @@ -1,3 +0,0 @@ -ifneq (,$(filter gnrc_netdev_default netdev_default,$(USEMODULE))) - USEMODULE += nrfmin -endif diff --git a/boards/pca10005/Makefile.features b/boards/pca10005/Makefile.features deleted file mode 100644 index ab69419945..0000000000 --- a/boards/pca10005/Makefile.features +++ /dev/null @@ -1,15 +0,0 @@ -# Put defined MCU peripherals here (in alphabetical order) -FEATURES_PROVIDED += periph_adc -FEATURES_PROVIDED += periph_gpio -FEATURES_PROVIDED += periph_rtt -FEATURES_PROVIDED += periph_spi -FEATURES_PROVIDED += periph_timer -FEATURES_PROVIDED += periph_uart - -# Various other features (if any) -FEATURES_PROVIDED += radio_nrfmin - -# The board MPU family (used for grouping by the CI system) -FEATURES_MCU_GROUP = cortex_m0_1 - --include $(RIOTCPU)/nrf51/Makefile.features diff --git a/boards/pca10005/Makefile.include b/boards/pca10005/Makefile.include deleted file mode 100644 index 4c62ef1f6b..0000000000 --- a/boards/pca10005/Makefile.include +++ /dev/null @@ -1,15 +0,0 @@ -# define the used CPU -export CPU = nrf51 -export CPU_MODEL = nrf51x22xxaa - -# set default port depending on operating system -PORT_LINUX ?= /dev/ttyUSB0 -PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) - -# setup JLink for flashing -export JLINK_DEVICE := nrf51822 -export JLINK_PRE_FLASH := w4 4001e504 1 -include $(RIOTMAKE)/tools/jlink.inc.mk - -# setup serial terminal -include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/pca10005/board.c b/boards/pca10005/board.c deleted file mode 100644 index 4954718106..0000000000 --- a/boards/pca10005/board.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2014 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_pca10005 - * @{ - * - * @file - * @brief Board specific implementations for the nRF51822 evaluation board pca10005 - * - * @author Christian Kühling - * @author Timo Ziegler - * @author Hauke Petersen - * - * @} - */ - -#include "board.h" -#include "cpu.h" - -void board_init(void) -{ - /* initialize the CPU */ - cpu_init(); -} diff --git a/boards/pca10005/include/board.h b/boards/pca10005/include/board.h deleted file mode 100644 index 11c421af14..0000000000 --- a/boards/pca10005/include/board.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2014 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_pca10005 PCA10005 (nRF51822 Development Kit) - * @ingroup boards - * @brief Board specific files for the nRF51822 board pca10005 - * @{ - * - * @file - * @brief Board specific definitions for the nRF51822 evaluation board pca10005 - * - * @author Christian Kühling - * @author Timo Ziegler - */ - -#ifndef BOARD_H -#define BOARD_H - -#include "cpu.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @name Xtimer configuration - * @{ - */ -#define XTIMER_WIDTH (24) -#define XTIMER_BACKOFF (40) -/** @} */ - -/** - * @brief Initialize board specific hardware, including clock, LEDs and std-IO - */ -void board_init(void); - -#ifdef __cplusplus -} -#endif - -#endif /* BOARD_H */ -/** @} */ diff --git a/boards/pca10005/include/periph_conf.h b/boards/pca10005/include/periph_conf.h deleted file mode 100644 index 3e1435f9a2..0000000000 --- a/boards/pca10005/include/periph_conf.h +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (C) 2014 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_pca10005 - * @{ - * - * @file - * @brief Peripheral MCU configuration for the nRF51822 board pca10005 - * - * @author Christian Kühling - * @author Timo Ziegler - * @author Hauke Petersen - */ - -#ifndef PERIPH_CONF_H -#define PERIPH_CONF_H - -#include "periph_cpu.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @name Clock configuration - * - * @note The radio will not work with the internal RC oscillator! - * - * @{ - */ -#define CLOCK_HFCLK (16U) /* set to 0: internal RC oscillator - 16: 16MHz crystal - 32: 32MHz crystal */ -#define CLOCK_LFCLK (0) /* set to 0: internal RC oscillator - * 1: 32.768 kHz crystal - * 2: derived from HFCLK */ -/** @} */ - -/** - * @name Timer configuration - * @{ - */ -static const timer_conf_t timer_config[] = { - /* dev, channels, width */ - { NRF_TIMER0, 3, TIMER_BITMODE_BITMODE_24Bit, TIMER0_IRQn } -}; - -#define TIMER_0_ISR isr_timer0 - -#define TIMER_NUMOF (sizeof(timer_config) / sizeof(timer_config[0])) -/** @} */ - -/** - * @name UART configuration - * @{ - */ -#define UART_NUMOF (1U) -/* UART pin configuration */ -#define UART_PIN_RX 11 -#define UART_PIN_TX 9 -/** @} */ - -/** - * @name Real time counter configuration - * @{ - */ -#define RTT_NUMOF (1U) -#define RTT_DEV (1) /* NRF_RTC1 */ -#define RTT_MAX_VALUE (0x00ffffff) -#define RTT_FREQUENCY (1024) -/** @} */ - -/** - * @name SPI configuration - * @{ - */ -static const spi_conf_t spi_config[] = { - { - .dev = NRF_SPI0, - .sclk = 19, - .mosi = 17, - .miso = 18 - }, - { - .dev = NRF_SPI1, - .sclk = 22, - .mosi = 20, - .miso = 21 - } -}; - -#define SPI_NUMOF (sizeof(spi_config) / sizeof(spi_config[0])) -/** @} */ - -/** - * @name ADC configuration - * - * The configuration consists simply of a list of channels that should be used - * @{ - */ -#define ADC_CONFIG {0, 1, 2, 3} -#define ADC_NUMOF (4) -/** @} */ - -/** - * @name Radio device configuration - * - * The radio is not guarded by a NUMOF define, as the radio is selected by its - * own module in the build system. - * @{ - */ -#define RADIO_IRQ_PRIO 1 -/** @} */ - -#ifdef __cplusplus -} -#endif - -#endif /* PERIPH_CONF_H */ From 24056f3fd8dd8ed370ea7d1f22d2496eca9957b9 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Thu, 9 Nov 2017 13:59:18 +0100 Subject: [PATCH 3/4] tests/examples: removed pca1000x from Makefiles --- examples/default/Makefile | 2 +- examples/dtls-echo/Makefile | 2 +- examples/gnrc_border_router/Makefile | 4 ++-- examples/gnrc_tftp/Makefile | 2 +- examples/javascript/Makefile | 4 ++-- examples/posix_sockets/Makefile | 2 +- tests/gnrc_ipv6_ext/Makefile | 2 +- tests/gnrc_netif2/Makefile | 2 +- tests/gnrc_sixlowpan/Makefile | 2 +- tests/gnrc_tcp_client/Makefile | 2 +- tests/gnrc_tcp_server/Makefile | 2 +- tests/lwip/Makefile | 2 +- tests/lwmac/Makefile | 2 +- tests/netstats_l2/Makefile | 2 +- tests/pkg_cmsis-dsp/Makefile | 2 -- tests/pkg_fatfs/Makefile | 2 +- tests/pkg_microcoap/Makefile | 2 +- tests/posix_semaphore/Makefile | 2 +- tests/thread_cooperation/Makefile | 2 +- tests/unittests/Makefile | 4 ---- 20 files changed, 20 insertions(+), 26 deletions(-) diff --git a/examples/default/Makefile b/examples/default/Makefile index ec3a9d0272..fa552a89ba 100644 --- a/examples/default/Makefile +++ b/examples/default/Makefile @@ -36,7 +36,7 @@ USEMODULE += saul_default BOARD_PROVIDES_NETIF := airfy-beacon cc2538dk fox iotlab-m3 iotlab-a8-m3 mulle \ microbit native nrf51dongle nrf52dk nrf6310 openmote-cc2538 pba-d-01-kw2x \ - pca10000 pca10005 remote-pa remote-reva samr21-xpro \ + remote-pa remote-reva samr21-xpro \ spark-core telosb yunjia-nrf51822 z1 ifneq (,$(filter $(BOARD),$(BOARD_PROVIDES_NETIF))) diff --git a/examples/dtls-echo/Makefile b/examples/dtls-echo/Makefile index 26aeb75846..7bc92deb5a 100644 --- a/examples/dtls-echo/Makefile +++ b/examples/dtls-echo/Makefile @@ -17,7 +17,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon b-l072z-lrwan1 bluepill calliope-mini microbit nrf51dongle nrf6310 nucleo32-f031 \ nucleo32-f042 nucleo32-f303 nucleo32-l031 nucleo-f030 \ nucleo-f070 nucleo-f072 nucleo-f103 nucleo-f302 nucleo-f334 \ - nucleo-l053 nucleo-l073 opencm904 pca10000 pca10005 \ + nucleo-l053 nucleo-l073 opencm904 \ spark-core stm32f0discovery yunjia-nrf51822 # Include packages that pull up and auto-init the link layer. diff --git a/examples/gnrc_border_router/Makefile b/examples/gnrc_border_router/Makefile index 99a63aecd8..9a40d3c424 100644 --- a/examples/gnrc_border_router/Makefile +++ b/examples/gnrc_border_router/Makefile @@ -12,8 +12,8 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon b-l072z-lrwan1 bluepill calliope-mini microbit msb-430 msb-430h nrf51dongle nrf6310 \ nucleo32-f031 nucleo32-f042 nucleo32-f303 nucleo32-l031 \ nucleo-f030 nucleo-f070 nucleo-f072 nucleo-f103 nucleo-f302 \ - nucleo-f334 nucleo-l053 nucleo-l073 opencm904 pca10000 \ - pca10005 spark-core stm32f0discovery telosb wsn430-v1_3b \ + nucleo-f334 nucleo-l053 nucleo-l073 opencm904 \ + spark-core stm32f0discovery telosb wsn430-v1_3b \ wsn430-v1_4 yunjia-nrf51822 z1 BOARD_BLACKLIST += mips-malta pic32-wifire pic32-clicker# No full UART available. diff --git a/examples/gnrc_tftp/Makefile b/examples/gnrc_tftp/Makefile index 8e7b882daa..98e013fa24 100644 --- a/examples/gnrc_tftp/Makefile +++ b/examples/gnrc_tftp/Makefile @@ -11,7 +11,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon calliope-mini chronos microbit msb-430 msb-430h nrf51dongle nrf6310 nucleo32-f031 \ nucleo32-f042 nucleo32-f303 nucleo32-l031 nucleo-f030 \ nucleo-f070 nucleo-f072 nucleo-f103 nucleo-f302 nucleo-f334 \ - nucleo-l053 pca10000 pca10005 spark-core stm32f0discovery \ + nucleo-l053 spark-core stm32f0discovery \ telosb wsn430-v1_3b wsn430-v1_4 yunjia-nrf51822 z1 # Include packages that pull up and auto-init the link layer. diff --git a/examples/javascript/Makefile b/examples/javascript/Makefile index dbff6199bf..4e7ccbe936 100644 --- a/examples/javascript/Makefile +++ b/examples/javascript/Makefile @@ -9,8 +9,8 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon b-l072z-lrwan1 bluepill calliope-mini microbit nrf51dongle nrf6310 nucleo-f030 nucleo-f070 \ nucleo-f072 nucleo-f103 nucleo-f302 nucleo-f334 nucleo-f410 \ nucleo-l053 nucleo-l073 nucleo32-f031 nucleo32-f042 \ - nucleo32-f303 nucleo32-l031 opencm904 pca10000 \ - pca10005 spark-core stm32f0discovery yunjia-nrf51822 \ + nucleo32-f303 nucleo32-l031 opencm904 \ + spark-core stm32f0discovery yunjia-nrf51822 \ BOARD_WHITELIST := native samr21-xpro diff --git a/examples/posix_sockets/Makefile b/examples/posix_sockets/Makefile index 39232e351c..35cfbe4184 100644 --- a/examples/posix_sockets/Makefile +++ b/examples/posix_sockets/Makefile @@ -10,7 +10,7 @@ RIOTBASE ?= $(CURDIR)/../.. BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos msb-430 msb-430h nrf51dongle \ nrf6310 nucleo32-f031 nucleo32-f042 nucleo32-l031 \ nucleo-f030 nucleo-f070 nucleo-f072 nucleo-f334 \ - nucleo-l053 pca10000 pca10005 stm32f0discovery telosb \ + nucleo-l053 stm32f0discovery telosb \ wsn430-v1_3b wsn430-v1_4 yunjia-nrf51822 z1 # Include packages that pull up and auto-init the link layer. diff --git a/tests/gnrc_ipv6_ext/Makefile b/tests/gnrc_ipv6_ext/Makefile index e1ec7a4329..bdf97797b7 100644 --- a/tests/gnrc_ipv6_ext/Makefile +++ b/tests/gnrc_ipv6_ext/Makefile @@ -5,7 +5,7 @@ include ../Makefile.tests_common BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos maple-mini msb-430 msb-430h \ nrf51dongle nrf6310 nucleo32-f031 nucleo32-f042 \ nucleo32-l031 nucleo-f030 nucleo-f103 nucleo-f334 nucleo-l053 \ - pca10000 pca10005 spark-core stm32f0discovery telosb \ + spark-core stm32f0discovery telosb \ wsn430-v1_3b wsn430-v1_4 yunjia-nrf51822 z1 # Include packages that pull up and auto-init the link layer. diff --git a/tests/gnrc_netif2/Makefile b/tests/gnrc_netif2/Makefile index ebe8ef8156..be46110313 100644 --- a/tests/gnrc_netif2/Makefile +++ b/tests/gnrc_netif2/Makefile @@ -8,7 +8,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon b-l072z-lrwan1 bluepill calliope-mini nucleo-f030 nucleo-f070 nucleo-f072 nucleo-f103 \ nucleo-f302 nucleo-f334 nucleo-l053 nucleo-l073 \ nucleo32-f031 nucleo32-f042 nucleo32-f303 \ - nucleo32-l031 opencm904 pca10000 pca10005 \ + nucleo32-l031 opencm904 \ spark-core stm32f0discovery telosb wsn430-v1_3b \ wsn430-v1_4 yunjia-nrf51822 z1 \ diff --git a/tests/gnrc_sixlowpan/Makefile b/tests/gnrc_sixlowpan/Makefile index f98cd8c11b..bdf8bf2177 100644 --- a/tests/gnrc_sixlowpan/Makefile +++ b/tests/gnrc_sixlowpan/Makefile @@ -5,7 +5,7 @@ include ../Makefile.tests_common BOARD_INSUFFICIENT_MEMORY := airfy-beacon chronos maple-mini msb-430 msb-430h \ nrf51dongle nrf6310 nucleo32-f031 nucleo32-f042 \ nucleo32-l031 nucleo-f030 nucleo-f070 nucleo-f103 \ - nucleo-f334 nucleo-l053 pca10000 pca10005 spark-core \ + nucleo-f334 nucleo-l053 spark-core \ stm32f0discovery telosb wsn430-v1_3b wsn430-v1_4 \ yunjia-nrf51822 z1 diff --git a/tests/gnrc_tcp_client/Makefile b/tests/gnrc_tcp_client/Makefile index bbfb1c19b9..5e5704933d 100644 --- a/tests/gnrc_tcp_client/Makefile +++ b/tests/gnrc_tcp_client/Makefile @@ -16,7 +16,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon arduino-duemilanove arduino-mega2560 \ msb-430h nrf51dongle nrf6310 nucleo32-f031 \ nucleo32-f042 nucleo32-f303 nucleo32-l031 nucleo-f030 \ nucleo-f070 nucleo-f072 nucleo-f302 nucleo-f334 nucleo-l053 \ - pca10000 pca10005 sb-430 sb-430h stm32f0discovery telosb \ + sb-430 sb-430h stm32f0discovery telosb \ wsn430-v1_3b wsn430-v1_4 yunjia-nrf51822 z1 # Target Address, Target Port and number of Test Cycles diff --git a/tests/gnrc_tcp_server/Makefile b/tests/gnrc_tcp_server/Makefile index 2890dbaa0c..da3ea8fd60 100644 --- a/tests/gnrc_tcp_server/Makefile +++ b/tests/gnrc_tcp_server/Makefile @@ -16,7 +16,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon arduino-duemilanove arduino-mega2560 \ msb-430h nrf51dongle nrf6310 nucleo32-f031 \ nucleo32-f042 nucleo32-f303 nucleo32-l031 nucleo-f030 \ nucleo-f070 nucleo-f072 nucleo-f302 nucleo-f334 nucleo-l053 \ - pca10000 pca10005 sb-430 sb-430h stm32f0discovery telosb \ + sb-430 sb-430h stm32f0discovery telosb \ wsn430-v1_3b wsn430-v1_4 yunjia-nrf51822 z1 # This has to be the absolute path to the RIOT base directory: diff --git a/tests/lwip/Makefile b/tests/lwip/Makefile index b895726f9b..4d5939d215 100644 --- a/tests/lwip/Makefile +++ b/tests/lwip/Makefile @@ -8,7 +8,7 @@ BOARD_BLACKLIST := arduino-uno arduino-duemilanove arduino-mega2560 chronos \ wsn430-v1_4 z1 BOARD_INSUFFICIENT_MEMORY := airfy-beacon nrf6310 nucleo32-f031 nucleo32-f042 \ nucleo32-l031 nucleo-f030 nucleo-f334 nucleo-l053 \ - pca10005 stm32f0discovery yunjia-nrf51822 + stm32f0discovery yunjia-nrf51822 # including lwip_ipv6_mld would currently break this test on at86rf2xx radios USEMODULE += lwip lwip_ipv6_autoconfig lwip_sock_ip lwip_netdev diff --git a/tests/lwmac/Makefile b/tests/lwmac/Makefile index 6114630a44..c4dae67c28 100644 --- a/tests/lwmac/Makefile +++ b/tests/lwmac/Makefile @@ -41,7 +41,7 @@ USEMODULE += saul_default BOARD_PROVIDES_NETIF := airfy-beacon cc2538dk fox iotlab-m3 iotlab-a8-m3 mulle \ microbit native nrf51dongle nrf52dk nrf6310 openmote-cc2538 pba-d-01-kw2x \ - pca10000 pca10005 remote-pa remote-reva saml21-xpro samr21-xpro \ + remote-pa remote-reva saml21-xpro samr21-xpro \ spark-core telosb yunjia-nrf51822 z1 # Use modules for networking diff --git a/tests/netstats_l2/Makefile b/tests/netstats_l2/Makefile index 9e07775be1..afcee9e17d 100644 --- a/tests/netstats_l2/Makefile +++ b/tests/netstats_l2/Makefile @@ -2,7 +2,7 @@ APPLICATION = netstats include ../Makefile.tests_common BOARD_PROVIDES_NETIF := airfy-beacon fox iotlab-m3 mulle native nrf51dongle \ - nrf6310 pba-d-01-kw2x pca10000 pca10005 samd21-xpro saml21-xpro samr21-xpro spark-core \ + nrf6310 pba-d-01-kw2x samd21-xpro saml21-xpro samr21-xpro spark-core \ yunjia-nrf51822 BOARDS ?= $(shell find $(RIOTBASE)/boards/* -maxdepth 0 -type d \! -name "*-common" -exec basename {} \;) diff --git a/tests/pkg_cmsis-dsp/Makefile b/tests/pkg_cmsis-dsp/Makefile index 78f9352a99..ec502532ca 100644 --- a/tests/pkg_cmsis-dsp/Makefile +++ b/tests/pkg_cmsis-dsp/Makefile @@ -23,8 +23,6 @@ BOARD_WHITELIST := \ nucleo-l152 \ openmote-cc2538 \ pba-d-01-kw2x \ - pca10000 \ - pca10005 \ samd21-xpro \ saml21-xpro \ samr21-xpro \ diff --git a/tests/pkg_fatfs/Makefile b/tests/pkg_fatfs/Makefile index ef18059434..5abd583b50 100644 --- a/tests/pkg_fatfs/Makefile +++ b/tests/pkg_fatfs/Makefile @@ -17,7 +17,7 @@ BOARD_WHITELIST := native airfy-beacon arduino-due arduino-duemilanove arduino-m nucleo-f446 nucleo-l053 nucleo-l073 nucleo-l152 nucleo-l476 nucleo144-f207 \ nucleo144-f303 nucleo144-f413 nucleo144-f429 nucleo144-f446 nucleo32-f031 \ nucleo32-f042 nucleo32-f303 nucleo32-l031 nucleo32-l432 openmote-cc2538 \ - pba-d-01-kw2x pca10005 remote-pa remote-reva remote-revb samd21-xpro \ + pba-d-01-kw2x remote-pa remote-reva remote-revb samd21-xpro \ saml21-xpro samr21-xpro sodaq-autonomo spark-core stm32f0discovery \ stm32f3discovery stm32f4discovery telosb udoo waspmote-pro \ wsn430-v1_3b wsn430-v1_4 yunjia-nrf51822 z1 diff --git a/tests/pkg_microcoap/Makefile b/tests/pkg_microcoap/Makefile index fce28cfba2..86e2c8b913 100644 --- a/tests/pkg_microcoap/Makefile +++ b/tests/pkg_microcoap/Makefile @@ -2,7 +2,7 @@ APPLICATION = pkg_microcoap include ../Makefile.tests_common BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo32-f031 nucleo32-f042 \ - nucleo32-l031 nucleo-f030 nucleo-l053 pca10000 pca10005 \ + nucleo32-l031 nucleo-f030 nucleo-l053 \ stm32f0discovery telosb z1 # Include packages that pull up and auto-init the link layer. diff --git a/tests/posix_semaphore/Makefile b/tests/posix_semaphore/Makefile index a3b47fb9b2..6d2aa7ac4a 100644 --- a/tests/posix_semaphore/Makefile +++ b/tests/posix_semaphore/Makefile @@ -3,7 +3,7 @@ include ../Makefile.tests_common BOARD_INSUFFICIENT_MEMORY := chronos mbed_lpc1768 msb-430 msb-430h nrf6310 \ nucleo32-f031 nucleo32-f042 nucleo32-l031 nucleo-f030 \ - nucleo-f334 nucleo-l053 pca10000 pca10005 spark-core \ + nucleo-f334 nucleo-l053 spark-core \ stm32f0discovery yunjia-nrf51822 USEMODULE += fmt diff --git a/tests/thread_cooperation/Makefile b/tests/thread_cooperation/Makefile index e6ae2ac311..b22fa75498 100644 --- a/tests/thread_cooperation/Makefile +++ b/tests/thread_cooperation/Makefile @@ -7,7 +7,7 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon b-l072z-lrwan1 bluepill calliope-mini nrf6310 nucleo32-f031 nucleo32-f042 nucleo32-f303 \ nucleo32-l031 nucleo-f030 nucleo-f070 nucleo-f072 \ nucleo-f103 nucleo-f302 nucleo-f334 nucleo-l053 nucleo-l073 \ - opencm904 pca10000 pca10005 spark-core stm32f0discovery \ + opencm904 spark-core stm32f0discovery \ yunjia-nrf51822 DISABLE_MODULE += auto_init diff --git a/tests/unittests/Makefile b/tests/unittests/Makefile index 5236bde4f4..6a7d0c1be6 100644 --- a/tests/unittests/Makefile +++ b/tests/unittests/Makefile @@ -45,8 +45,6 @@ BOARD_INSUFFICIENT_MEMORY := airfy-beacon \ openmote \ openmote-cc2538 \ pba-d-01-kw2x \ - pca10000 \ - pca10005 \ remote-pa \ remote-reva \ remote-revb \ @@ -125,8 +123,6 @@ ARM_CORTEX_M_BOARDS := airfy-beacon \ opencm904 \ openmote-cc2538 \ pba-d-01-kw2x \ - pca10000 \ - pca10005 \ remote \ samd21-xpro \ saml21-xpro \ From fef2a4e1629d25f8777360ab5c6f47cee0552bcc Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Thu, 9 Nov 2017 14:00:09 +0100 Subject: [PATCH 4/4] boards/nrf6310: fixed doc --- boards/nrf6310/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/nrf6310/board.c b/boards/nrf6310/board.c index 48347ce5b0..a2f83e1775 100644 --- a/boards/nrf6310/board.c +++ b/boards/nrf6310/board.c @@ -11,7 +11,7 @@ * @{ * * @file board.c - * @brief Board specific implementations for the nRF51822 evaluation board pca10005 + * @brief Board specific implementations for the NRF6310 board * * @author Christian Kühling * @author Timo Ziegler