riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8100 from haukepetersen/opt_boards_duebased

Browse Source 
boards: factor out shared code for arduino-due and udoo
This commit is contained in:
Peter Kietzmann 2017-11-30 14:02:44 +01:00 committed by GitHub
commit 35f7859be8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 108 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boards/arduino-due/Makefile
View File

@ -1,3 +1,4 @@
MODULE = board
DIRS = $(RIOTBOARD)/common/arduino-due
include $(RIOTBASE)/Makefile.base

4
boards/arduino-due/Makefile.dep
View File

@ -1,3 +1 @@
ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio
endif
include $(RIOTBOARD)/common/arduino-due/Makefile.dep

17
boards/arduino-due/Makefile.features
View File

@ -1,16 +1 @@
# Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_adc
FEATURES_PROVIDED += periph_dac
FEATURES_PROVIDED += periph_gpio
FEATURES_PROVIDED += periph_pwm
FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart
# Various other features (if any)
FEATURES_PROVIDED += arduino
# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m3_1
-include $(RIOTCPU)/sam3/Makefile.features
include $(RIOTBOARD)/common/arduino-due/Makefile.features

15
boards/arduino-due/Makefile.include
View File

@ -1,14 +1 @@
# define the cpu used by the arduino due board
export CPU = sam3
export CPU_MODEL = sam3x8e
# define the default port depending on the host OS
PORT_LINUX ?= /dev/ttyACM0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
# setup serial terminal
include $(RIOTMAKE)/tools/serial.inc.mk
# setup flasher (using BOSSA)
export BOSSA_ARDUINO_PREFLASH = yes
include $(RIOTMAKE)/tools/bossa.inc.mk
include $(RIOTBOARD)/common/arduino-due/Makefile.include

31
boards/arduino-due/board.c
View File

@ -1,31 +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_arduino-due
* @{
*
* @file
* @brief Board specific implementations for the Arduino Due board
*
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*
* @}
*/
#include "cpu.h"
#include "board.h"
#include "periph/gpio.h"
void board_init(void)
{
/* initialize the CPU */
cpu_init();
/* initialize the on-board Amber "L" LED @ pin PB27 */
gpio_init(LED0_PIN, GPIO_OUT);
}

13
boards/arduino-due/doc.txt Normal file
View File

@ -0,0 +1,13 @@
/*
* Copyright (C) 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_arduino-due Arduino Due
* @ingroup boards
* @brief Support for the Arduino Due board
*/

3
boards/common/arduino-due/Makefile Normal file
View File

@ -0,0 +1,3 @@
MODULE = boards_common_arduino_due
include $(RIOTBASE)/Makefile.base

3
boards/common/arduino-due/Makefile.dep Normal file
View File

@ -0,0 +1,3 @@
ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio
endif

16
boards/common/arduino-due/Makefile.features Normal file
View File

@ -0,0 +1,16 @@
# Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_adc
FEATURES_PROVIDED += periph_dac
FEATURES_PROVIDED += periph_gpio
FEATURES_PROVIDED += periph_pwm
FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart
# Various other features (if any)
FEATURES_PROVIDED += arduino
# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m3_1
-include $(RIOTCPU)/sam3/Makefile.features

18
boards/common/arduino-due/Makefile.include Normal file
View File

@ -0,0 +1,18 @@
# define the cpu used by the arduino due based boards
export CPU = sam3
export CPU_MODEL = sam3x8e
# export this module and its includes
USEMODULE += boards_common_arduino_due
INCLUDES += -I$(RIOTBOARD)/common/arduino-due/include
# define the default port depending on the host OS
PORT_LINUX ?= /dev/ttyACM0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
# setup serial terminal
include $(RIOTMAKE)/tools/serial.inc.mk
# setup flasher (using BOSSA)
export BOSSA_ARDUINO_PREFLASH = yes
include $(RIOTMAKE)/tools/bossa.inc.mk

10
boards/udoo/board.c → boards/common/arduino-due/board.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2014-2016 Freie Universität Berlin
* Copyright (C) 2014-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
@ -7,11 +7,11 @@
*/
/**
* @ingroup boards_udoo
* @ingroup boards_common_arduino_due
* @{
*
* @file
* @brief Board specific implementations for the UDOO board
* @brief Board specific for Arduino-due-based boards
*
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*
@ -24,8 +24,8 @@
void board_init(void)
{
/* initialize the on-board Amber "L" LED @ pin PB27 */
gpio_init(LED0_PIN, GPIO_OUT);
/* initialize the CPU */
cpu_init();
/* initialize the on-board Amber "L" LED @ pin PB27 */
gpio_init(LED0_PIN, GPIO_OUT);
}

4
boards/arduino-due/include/arduino_board.h → boards/common/arduino-due/include/arduino_board.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 Freie Universität Berlin
* Copyright (C) 2016,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
@ -7,7 +7,7 @@
*/
/**
* @ingroup boards_arduino-due
* @ingroup boards_common_arduino_due
* @{
*
* @file

6
boards/arduino-due/include/arduino_pinmap.h → boards/common/arduino-due/include/arduino_pinmap.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2015 Freie Universität Berlin
* Copyright (C) 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
@ -7,7 +7,7 @@
*/
/**
* @ingroup boards_arduino-due
* @ingroup boards_common_arduino_due
* @{
*
* @file
@ -43,7 +43,7 @@ extern "C" {
#define ARDUINO_PIN_7 GPIO_PIN(PC, 23)
#define ARDUINO_PIN_8 GPIO_PIN(PC, 22)
#define ARDUINO_PIN_9 GPIO_PIN(PC, 21)
#define ARDUINO_PIN_10 GPIO_PIN(PA, 2)
#define ARDUINO_PIN_10 GPIO_PIN(PC, 29)
#define ARDUINO_PIN_11 GPIO_PIN(PD, 7)
#define ARDUINO_PIN_12 GPIO_PIN(PD, 8)
#define ARDUINO_PIN_13 GPIO_PIN(PB, 27)

8
boards/arduino-due/include/board.h → boards/common/arduino-due/include/board.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2014 Freie Universität Berlin
* Copyright (C) 2014,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
@ -7,13 +7,13 @@
*/
/**
* @defgroup boards_arduino-due Arduino Due
* @defgroup boards_common_arduino_due Shared Arduino Due Code
* @ingroup boards
* @brief Support for the Arduino Due board.
* @brief Shared code for Arduino Due based boards
* @{
*
* @file
* @brief Board specific definitions for the Arduino Due board.
* @brief Board specific definitions for the Arduino Due based boards
*
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/

4
boards/arduino-due/include/gpio_params.h → boards/common/arduino-due/include/gpio_params.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 Freie Universität Berlin
* Copyright (C) 2016-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
@ -7,7 +7,7 @@
*/
/**
* @ingroup boards_boards_arduino-due
* @ingroup boards_common_arduino_due
* @{
*
* @file

8
boards/arduino-due/include/periph_conf.h → boards/common/arduino-due/include/periph_conf.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2014-2015 Freie Universität Berlin
/*
* Copyright (C) 2014-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
@ -7,11 +7,11 @@
*/
/**
* @ingroup boards_arduino-due
* @ingroup boards_common_arduino_due
* @{
*
* @file
* @brief Peripheral MCU configuration for the Arduino Due board
* @brief Peripheral MCU configuration for Arduino Due based boards
*
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
* @author Peter Kietzmann <peter.kietzmann@haw-hamburg.de>

14
boards/arduino-due/include/sdcard_spi_params.h → boards/common/arduino-due/include/sdcard_spi_params.h
View File

@ -8,11 +8,11 @@
*/
/**
* @ingroup boards_arduino-due
* @ingroup boards_common_arduino_due
* @{
*
* @file
* @brief SD card configuration for the Arduino due
* @brief SD card configuration for the Arduino SD card shields
*
* @author Michel Rottleuthner <michel.rottleuthner@haw-hamburg.de>
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
@ -21,7 +21,7 @@
#ifndef SDCARD_SPI_PARAMS_H
#define SDCARD_SPI_PARAMS_H
#include "board.h"
#include "arduino_pinmap.h"
#ifdef __cplusplus
extern "C" {
@ -35,16 +35,16 @@ extern "C" {
#define SDCARD_SPI_PARAM_SPI (SPI_DEV(0))
#endif
#ifndef SDCARD_SPI_PARAM_CS
#define SDCARD_SPI_PARAM_CS (GPIO_PIN(PA, 29))
#define SDCARD_SPI_PARAM_CS (ARDUINO_PIN_4)
#endif
#ifndef SDCARD_SPI_PARAM_CLK
#define SDCARD_SPI_PARAM_CLK (GPIO_PIN(PA, 27))
#define SDCARD_SPI_PARAM_CLK (ARDUINO_PIN_76)
#endif
#ifndef SDCARD_SPI_PARAM_MOSI
#define SDCARD_SPI_PARAM_MOSI (GPIO_PIN(PA, 26))
#define SDCARD_SPI_PARAM_MOSI (ARDUINO_PIN_75)
#endif
#ifndef SDCARD_SPI_PARAM_MISO
#define SDCARD_SPI_PARAM_MISO (GPIO_PIN(PA, 25))
#define SDCARD_SPI_PARAM_MISO (ARDUINO_PIN_74)
#endif
#ifndef SDCARD_SPI_PARAM_POWER
#define SDCARD_SPI_PARAM_POWER (GPIO_UNDEF)

10
boards/arduino-due/include/w5100_params.h → boards/common/arduino-due/include/w5100_params.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2016 Freie Universität Berlin
* Copyright (C) 2016-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
@ -7,7 +7,7 @@
*/
/**
* @ingroup boards_arduino-due
* @ingroup boards_common_arduino_due
* @{
*
* @file
@ -19,6 +19,8 @@
#ifndef W5100_PARAMS_H
#define W5100_PARAMS_H
#include "arduino_pinmap.h"
#ifdef __cplusplus
extern "C" {
#endif
@ -34,10 +36,10 @@ extern "C" {
#define W5100_PARAM_SPI_CLK (SPI_CLK_5MHZ)
#endif
#ifndef W5100_PARAM_CS
#define W5100_PARAM_CS (GPIO_PIN(2, 29))
#define W5100_PARAM_CS (ARDUINO_PIN_10)
#endif
#ifndef W5100_PARAM_EVT
#define W5100_PARAM_EVT (GPIO_PIN(1, 25))
#define W5100_PARAM_EVT (ARDUINO_PIN_2)
#endif
/** @} */

1
boards/udoo/Makefile
View File

@ -1,3 +1,4 @@
MODULE = board
DIRS = $(RIOTBOARD)/common/arduino-due
include $(RIOTBASE)/Makefile.base

1
boards/udoo/Makefile.dep Normal file
View File

@ -0,0 +1 @@
include $(RIOTBOARD)/common/arduino-due/Makefile.dep

11
boards/udoo/Makefile.features
View File

@ -1,10 +1 @@
# Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_gpio
FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart
# The board MPU family (used for grouping by the CI system)
FEATURES_MCU_GROUP = cortex_m3_2
-include $(RIOTCPU)/sam3/Makefile.features
include $(RIOTBOARD)/common/arduino-due/Makefile.features

15
boards/udoo/Makefile.include
View File

@ -1,14 +1 @@
# define the cpu used by the udoo board
export CPU = sam3
export CPU_MODEL = sam3x8e
# define the default port depending on host OS
PORT_LINUX ?= /dev/ttyACM0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
# setup serial terminal
include $(RIOTMAKE)/tools/serial.inc.mk
# setup the flash tool (BOSSA)
export BOSSA_ARDUINO_PREFLASH = yes
include $(RIOTMAKE)/tools/bossa.inc.mk
include $(RIOTBOARD)/common/arduino-due/Makefile.include

13
boards/udoo/doc.txt Normal file
View File

@ -0,0 +1,13 @@
/*
* Copyright (C) 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_udoo UDOO
* @ingroup boards
* @brief Support for the UDOO board
*/

55
boards/udoo/include/board.h
View File

@ -1,55 +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_udoo UDOO
* @ingroup boards
* @brief Support for the UDOO board.
* @{
*
* @file
* @brief Board specific definitions for the UDOO board.
*
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/
#ifndef BOARD_H
#define BOARD_H
#include "cpu.h"
#include "cpu_conf.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* @name LED pin definitions and handlers
* @{
*/
#define LED0_PIN GPIO_PIN(PB, 27)
#define LED_PORT PIOB
#define LED0_MASK PIO_PB27
#define LED0_ON (LED_PORT->PIO_SODR = LED0_MASK)
#define LED0_OFF (LED_PORT->PIO_CODR = LED0_MASK)
#define LED0_TOGGLE ((PIOB->PIO_ODSR & LED0_MASK) ? LED0_OFF : LED0_ON)
/** @} */
/**
* @brief Initialize board specific hardware, including clock, LEDs and std-IO
*/
void board_init(void);
#ifdef __cplusplus
}
#endif
#endif /* BOARD_H */
/** @} */

135
boards/udoo/include/periph_conf.h
View File

@ -1,135 +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_udoo
* @{
*
* @file
* @brief Peripheral MCU configuration for the UDOO board
*
* @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
* @{
*/
/* targeted system core clock */
#define CLOCK_CORECLOCK (84000000UL)
/* external oscillator clock */
#define CLOCK_EXT_OSC (12000000UL)
/* define PLL configuration
*
* The values must fulfill this equation:
* CORECLOCK = (EXT_OCS / PLL_DIV) * (PLL_MUL + 1)
*/
#define CLOCK_PLL_MUL (83)
#define CLOCK_PLL_DIV (12)
/* number of wait states before flash read and write operations */
#define CLOCK_FWS (4) /* 4 is save for 84MHz */
/** @} */
/**
* @name Timer peripheral configuration
* @{
*/
static const timer_conf_t timer_config[] = {
/* dev, channel 0 ID */
{ TC0, ID_TC0 },
{ TC1, ID_TC3 },
};
#define TIMER_0_ISR isr_tc0
#define TIMER_1_ISR isr_tc3
#define TIMER_NUMOF (sizeof(timer_config) / sizeof(timer_config[0]))
/** @} */
/**
* @name UART configuration
* @{
*/
static const uart_conf_t uart_config[] = {
{
.dev = (Uart *)UART,
.rx_pin = GPIO_PIN(PA, 8),
.tx_pin = GPIO_PIN(PA, 9),
.mux = GPIO_MUX_A,
.pmc_id = ID_UART,
.irqn = UART_IRQn
},
{
.dev = (Uart *)USART0,
.rx_pin = GPIO_PIN(PA, 10),
.tx_pin = GPIO_PIN(PA, 11),
.mux = GPIO_MUX_A,
.pmc_id = ID_USART0,
.irqn = USART0_IRQn
},
{
.dev = (Uart *)USART1,
.rx_pin = GPIO_PIN(PA, 12),
.tx_pin = GPIO_PIN(PA, 13),
.mux = GPIO_MUX_A,
.pmc_id = ID_USART1,
.irqn = USART1_IRQn
},
{
.dev = (Uart *)USART3,
.rx_pin = GPIO_PIN(PD, 5),
.tx_pin = GPIO_PIN(PD, 4),
.mux = GPIO_MUX_B,
.pmc_id = ID_USART3,
.irqn = USART3_IRQn
}
};
/* define interrupt vectors */
#define UART_0_ISR isr_uart
#define UART_1_ISR isr_usart0
#define UART_2_ISR isr_usart1
#define UART_3_ISR isr_usart3
#define UART_NUMOF (sizeof(uart_config) / sizeof(uart_config[0]))
/** @} */
/**
* @name SPI configuration
* @{
*/
static const spi_conf_t spi_config[] = {
{
.dev = SPI0,
.id = ID_SPI0,
.clk = GPIO_PIN(PA, 25),
.mosi = GPIO_PIN(PA, 26),
.miso = GPIO_PIN(PA, 27),
.mux = GPIO_MUX_A
}
};
#define SPI_NUMOF (sizeof(spi_config) / sizeof(spi_config[0]))
/** @} */
#ifdef __cplusplus
}
#endif
#endif /* PERIPH_CONF_H */
/** @} */