Skip to content
Snippets Groups Projects
Unverified Commit 39b67261 authored by Kaspar Schleiser's avatar Kaspar Schleiser Committed by GitHub
Browse files

Merge pull request #7979 from haukepetersen/rm_board_pca1000x 

boards: removed support for pca1000[0|5]
parents c26b4695 fef2a4e1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 494 deletions
boards/nrf6310/board.c
+ 1
− 1
View file @ 39b67261
......@@ -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 <kuehling@zedat.fu-berlin.de>
* @author Timo Ziegler <timo.ziegler@fu-berlin.de>
......
boards/pca10000/Makefile deleted 100644 → 0
+ 0
− 3
View file @ c26b4695
MODULE = board
include $(RIOTBASE)/Makefile.base
boards/pca10000/Makefile.dep deleted 100644 → 0
+ 0
− 3
View file @ c26b4695
ifneq (,$(filter gnrc_netdev_default netdev_default,$(USEMODULE)))
USEMODULE += nrfmin
endif
boards/pca10000/Makefile.features deleted 100644 → 0
+ 0
− 13
View file @ c26b4695
# 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
boards/pca10000/Makefile.include deleted 100644 → 0
+ 0
− 15
View file @ c26b4695
# 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
boards/pca10000/board.c deleted 100644 → 0
+ 0
− 33
View file @ c26b4695
/*
* 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 <kuehling@zedat.fu-berlin.de>
* @author Timo Ziegler <timo.ziegler@fu-berlin.de>
*
* @}
*/
#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();
}
boards/pca10000/include/board.h deleted 100644 → 0
+ 0
− 74
View file @ c26b4695
/*
* 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 <kuehling@zedat.fu-berlin.de>
* @author Timo Ziegler <timo.ziegler@fu-berlin.de>
*/
#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 */
/** @} */
boards/pca10000/include/periph_conf.h deleted 100644 → 0
+ 0
− 105
View file @ c26b4695
/*
* 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 <kuehling@zedat.fu-berlin.de>
* @author Timo Ziegler <timo.ziegler@fu-berlin.de>
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/
#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 */
boards/pca10005/Makefile deleted 100644 → 0
+ 0
− 3
View file @ c26b4695
MODULE = board
include $(RIOTBASE)/Makefile.base
boards/pca10005/Makefile.dep deleted 100644 → 0
+ 0
− 3
View file @ c26b4695
ifneq (,$(filter gnrc_netdev_default netdev_default,$(USEMODULE)))
USEMODULE += nrfmin
endif
boards/pca10005/Makefile.features deleted 100644 → 0
+ 0
− 15
View file @ c26b4695
# 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
boards/pca10005/Makefile.include deleted 100644 → 0
+ 0
− 15
View file @ c26b4695
# 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
boards/pca10005/board.c deleted 100644 → 0
+ 0
− 30
View file @ c26b4695
/*
* 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 <kuehling@zedat.fu-berlin.de>
* @author Timo Ziegler <timo.ziegler@fu-berlin.de>
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*
* @}
*/
#include "board.h"
#include "cpu.h"
void board_init(void)
{
/* initialize the CPU */
cpu_init();
}
boards/pca10005/include/board.h deleted 100644 → 0
+ 0
− 49
View file @ c26b4695
/*
* 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 <kuehling@zedat.fu-berlin.de>
* @author Timo Ziegler <timo.ziegler@fu-berlin.de>
*/
#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 */
/** @} */
boards/pca10005/include/periph_conf.h deleted 100644 → 0
+ 0
− 125
View file @ c26b4695
/*
* 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 <kuehling@zedat.fu-berlin.de>
* @author Timo Ziegler <timo.ziegler@fu-berlin.de>
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/
#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 */
examples/default/Makefile
+ 1
− 1
View file @ 39b67261
......@@ -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)))
......
examples/dtls-echo/Makefile
+ 1
− 1
View file @ 39b67261
......@@ -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.
......
examples/gnrc_border_router/Makefile
+ 2
− 2
View file @ 39b67261
......@@ -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.
......
examples/gnrc_tftp/Makefile
+ 1
− 1
View file @ 39b67261
......@@ -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.
......
examples/javascript/Makefile
+ 2
− 2
View file @ 39b67261
......@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment