RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 05:12:57 +01:00
Code Releases Activity

Merge pull request #13694 from fjmolinas/pr_boards_common_cc2538

Browse Source 
boards: add common cc2538
This commit is contained in:
benpicco 2020-03-25 11:11:50 +01:00 committed by GitHub
commit e9b71254ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 56 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boards/cc2538dk/Makefile.include
View File

@ -31,3 +31,6 @@ DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
RESET_FLAGS ?= $(BINDIR)
OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
# include common cc2538 includes
INCLUDES += -I$(RIOTBOARD)/common/cc2538/include

72
boards/cc2538dk/include/periph_conf.h
View File

@ -22,79 +22,13 @@
#include "cpu.h"
#include "periph_cpu.h"
#include "cfg_clk_default.h"
#include "cfg_timer_default.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* @name Clock system configuration
* @{
*/
/*
* 0: use internal 32KHz RCOSC
* 1: use external 32KHz XOSC
*/
#ifndef SYS_CTRL_OSC32K_USE_XTAL
#define SYS_CTRL_OSC32K_USE_XTAL (1)
#endif
/*
* 0: use internal 16MHz RCOSC
* 1: use external 32MHz XOSC, required for RF operation
*/
#ifndef SYS_CTRL_OSC_USE_XTAL
#define SYS_CTRL_OSC_USE_XTAL (1)
#endif
#if SYS_CTRL_OSC_USE_XTAL
#define CLOCK_OSC (XOSC32M_FREQ)
#else
#define CLOCK_OSC (RCOSC16M_FREQ)
#endif
#if SYS_CTRL_OSC32K_USE_XTAL
#define CLOCK_OSC32K (XOSC32K_FREQ) /* XCOSC frequency */
#else
#define CLOCK_OSC32K (RCOSC32K_FREQ) /* XCOSC frequency */
#endif
/* System clock frequency 32MHz */
#define CLOCK_CORECLOCK (CLOCK_OSC)
/* I/O clock rate setting 16MHz */
#define CLOCK_IO (CLOCK_OSC / 2)
/** @} */
/**
* @name Timer configuration
*
* General purpose timers (GPT[0-3]) are configured consecutively and in order
* (without gaps) starting from GPT0, i.e. if multiple timers are enabled.
*
* @{
*/
static const timer_conf_t timer_config[] = {
{
.chn = 2,
.cfg = GPTMCFG_16_BIT_TIMER, /* required for XTIMER */
},
{
.chn = 1,
.cfg = GPTMCFG_32_BIT_TIMER,
},
{
.chn = 2,
.cfg = GPTMCFG_16_BIT_TIMER,
},
{
.chn = 1,
.cfg = GPTMCFG_32_BIT_TIMER,
},
};
#define TIMER_NUMOF ARRAY_SIZE(timer_config)
#define TIMER_IRQ_PRIO 1
/** @} */
/**
* @name UART configuration
* @{

17
boards/common/cc2538/doc.txt Normal file
View File

@ -0,0 +1,17 @@
/*
* Copyright (C) 2020 Inria
*
* 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_cc2538 cc2538 Configuration Snippets
* @ingroup boards_common
* @brief Board configuration snippets for cc2538-based boards
*
* All boards using a cc2538 share certain parts of their configuration. This
* module provides a collection of fine grained configuration snippets that can
* be reused for different boards.
*/

18
boards/common/remote/include/cfg_clk_default.h → boards/common/cc2538/include/cfg_clk_default.h
View File

@ -1,6 +1,7 @@
/*
* Copyright (C) 2014-2016 Freie Universität Berlin
* 2015 Zolertia SL
* 2020 Inria
*
* 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
@ -8,20 +9,26 @@
*/
/**
* @ingroup boards_common_remote
* @ingroup boards_common_cc2538
* @{
*
* @file
* @brief Common default clock configuration for the RE-Mote board revision A
* @brief Default clock configuration for cc2538 based boards
*
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
* @author Antonio Lignan <alinan@zolertia.com>
* @author Sebastian Meiling <s@mlng.net>
* @author Francisco Molina <francois-xavier.molina@inria.fr>
*/
#ifndef CFG_CLK_DEFAULT_H
#define CFG_CLK_DEFAULT_H
#include <stdint.h>
#include "cpu.h"
#include "periph_cpu.h"
#ifdef __cplusplus
extern "C" {
#endif
@ -30,6 +37,7 @@ extern "C" {
* @name Clock system configuration
* @{
*/
/*
* 0: use internal 32KHz RCOSC
* 1: use external 32KHz XOSC
@ -58,13 +66,17 @@ extern "C" {
#endif
/* System clock frequency 32MHz */
#ifndef CLOCK_CORECLOCK
#define CLOCK_CORECLOCK (CLOCK_OSC)
#endif
/* I/O clock rate setting 16MHz */
#ifndef CLOCK_IO
#define CLOCK_IO (CLOCK_OSC / 2)
#endif
/** @} */
#ifdef __cplusplus
} /* end extern "C" */
}
#endif
#endif /* CFG_CLK_DEFAULT_H */

4
boards/common/remote/include/cfg_timer_default.h → boards/common/cc2538/include/cfg_timer_default.h
View File

@ -8,11 +8,11 @@
*/
/**
* @ingroup boards_common_remote
* @ingroup boards_common_cc2538
* @{
*
* @file
* @brief Common default timer configuration for the RE-Mote board revision A
* @brief Common default timer configuration for cc2538 boards
*
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
* @author Antonio Lignan <alinan@zolertia.com>

3
boards/common/remote/Makefile.include
View File

@ -27,5 +27,8 @@ FLASHFILE ?= $(BINFILE)
DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
# include common cc2538 includes
INCLUDES += -I$(RIOTBOARD)/common/cc2538/include
# include common remote includes
INCLUDES += -I$(RIOTBOARD)/common/remote/include

3
boards/openmote-b/Makefile.include
View File

@ -29,3 +29,6 @@ else ifeq ($(PROGRAMMER),jlink)
endif
OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
# include common cc2538 includes
INCLUDES += -I$(RIOTBOARD)/common/cc2538/include

71
boards/openmote-b/include/periph_conf.h
View File

@ -25,78 +25,13 @@
#include "cc2538_gpio.h"
#include "periph_cpu.h"
#include "cfg_clk_default.h"
#include "cfg_timer_default.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* @name Clock system configuration
* @{
*/
/*
* 0: use internal 32KHz RCOSC
* 1: use external 32KHz XOSC
*/
#ifndef SYS_CTRL_OSC32K_USE_XTAL
#define SYS_CTRL_OSC32K_USE_XTAL (1)
#endif
/*
* 0: use internal 16MHz RCOSC
* 1: use external 32MHz XOSC, required for RF operation
*/
#ifndef SYS_CTRL_OSC_USE_XTAL
#define SYS_CTRL_OSC_USE_XTAL (1)
#endif
#if SYS_CTRL_OSC_USE_XTAL
#define CLOCK_OSC (XOSC32M_FREQ)
#else
#define CLOCK_OSC (RCOSC16M_FREQ)
#endif
#if SYS_CTRL_OSC32K_USE_XTAL
#define CLOCK_OSC32K (XOSC32K_FREQ) /* XCOSC frequency */
#else
#define CLOCK_OSC32K (RCOSC32K_FREQ) /* XCOSC frequency */
#endif
/* System clock frequency 32MHz */
#define CLOCK_CORECLOCK (CLOCK_OSC)
/* I/O clock rate setting 16MHz */
#define CLOCK_IO (CLOCK_OSC / 2)
/** @} */
/**
* @name Timer configuration
*
* General purpose timers (GPT[0-3]) are configured consecutively and
* in order (without gaps) starting from GPT0, i.e. if multiple timers are enabled.
*
* @{
*/
static const timer_conf_t timer_config[] = {
{
.chn = 2,
.cfg = GPTMCFG_16_BIT_TIMER, /* required for XTIMER */
},
{
.chn = 1,
.cfg = GPTMCFG_32_BIT_TIMER,
},
{
.chn = 2,
.cfg = GPTMCFG_16_BIT_TIMER,
},
{
.chn = 1,
.cfg = GPTMCFG_32_BIT_TIMER,
},
};
#define TIMER_NUMOF ARRAY_SIZE(timer_config)
#define TIMER_IRQ_PRIO 1
/** @} */
/**
* @name ADC configuration
* @{

3
boards/openmote-cc2538/Makefile.include
View File

@ -18,3 +18,6 @@ else ifeq ($(PROGRAMMER),cc2538-bsl)
PROG_BAUD ?= 460800
include $(RIOTMAKE)/tools/cc2538-bsl.inc.mk
endif
# include common cc2538 includes
INCLUDES += -I$(RIOTBOARD)/common/cc2538/include

70
boards/openmote-cc2538/include/periph_conf.h
View File

@ -23,77 +23,13 @@
#include "cc2538_gpio.h"
#include "periph_cpu.h"
#include "cfg_clk_default.h"
#include "cfg_timer_default.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* @name Clock system configuration
* @{
*/
/*
* 0: use internal 32KHz RCOSC
* 1: use external 32KHz XOSC
*/
#ifndef SYS_CTRL_OSC32K_USE_XTAL
#define SYS_CTRL_OSC32K_USE_XTAL (1)
#endif
/*
* 0: use internal 16MHz RCOSC
* 1: use external 32MHz XOSC, required for RF operation
*/
#ifndef SYS_CTRL_OSC_USE_XTAL
#define SYS_CTRL_OSC_USE_XTAL (1)
#endif
#if SYS_CTRL_OSC_USE_XTAL
#define CLOCK_OSC (XOSC32M_FREQ)
#else
#define CLOCK_OSC (RCOSC16M_FREQ)
#endif
#if SYS_CTRL_OSC32K_USE_XTAL
#define CLOCK_OSC32K (XOSC32K_FREQ) /* XCOSC frequency */
#else
#define CLOCK_OSC32K (RCOSC32K_FREQ) /* XCOSC frequency */
#endif
/* System clock frequency 32MHz */
#define CLOCK_CORECLOCK (CLOCK_OSC)
/* I/O clock rate setting 16MHz */
#define CLOCK_IO (CLOCK_OSC / 2)
/** @} */
/**
* @name Timer configuration
*
* General purpose timers (GPT[0-3]) are configured consecutively and in order
* (without gaps) starting from GPT0, i.e. if multiple timers are enabled.
*
* @{
*/
static const timer_conf_t timer_config[] = {
{
.chn = 2,
.cfg = GPTMCFG_16_BIT_TIMER, /* required for XTIMER */
},
{
.chn = 1,
.cfg = GPTMCFG_32_BIT_TIMER,
},
{
.chn = 2,
.cfg = GPTMCFG_16_BIT_TIMER,
},
{
.chn = 1,
.cfg = GPTMCFG_32_BIT_TIMER,
},
};
#define TIMER_NUMOF ARRAY_SIZE(timer_config)
#define TIMER_IRQ_PRIO 1
/** @} */
/**
* @name ADC configuration
* @{

8
cpu/cc2538/include/periph_cpu.h
View File

@ -343,13 +343,7 @@ typedef gpio_t adc_conf_t;
#define RTT_IRQ_PRIO 1
#define RTT_ISR isr_sleepmode
#define RTT_MAX_VALUE (0xffffffff)
#if SYS_CTRL_OSC32K_USE_XTAL
/* Frequency of XOSC off by default */
#define RTT_FREQUENCY (32768U) /* in Hz. For changes see `rtt.c` */
#else
/* Frequency of RCOSC on by default */
#define RTT_FREQUENCY (32753U) /* in Hz. For changes see `rtt.c` */
#endif
#define RTT_FREQUENCY (CLOCK_OSC32K)
/** @} */
/**