RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

cpu/cc26x0_cc13x0: use SetupTrimDevice only on cc26x0

Browse Source 
Signed-off-by: Jean Pierre Dudey <me@jeandudey.tech>
This commit is contained in:
Jean Pierre Dudey 2021-02-08 17:08:17 +01:00
parent 7db791476e
commit aec0edbcb9
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/cc26x0_cc13x0/Makefile
View File

@ -3,6 +3,8 @@ MODULE = cpu
# Add a list of subdirectories, that should also be built: # Add a list of subdirectories, that should also be built:
DIRS = periph $(RIOTCPU)/cortexm_common $(RIOTCPU)/cc26xx_cc13xx DIRS = periph $(RIOTCPU)/cortexm_common $(RIOTCPU)/cc26xx_cc13xx
DIRS += vendor/driverlib ifneq (,$(filter cc26x0_driverlib,$(USEMODULE)))
DIRS += vendor/driverlib
endif
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

6
cpu/cc26x0_cc13x0/Makefile.dep
View File

@ -1,4 +1,8 @@
USEMODULE += cc26xx_cc13xx USEMODULE += cc26xx_cc13xx
USEMODULE += cc26x0_driverlib # Module includes functions for SetupTrimDevice,
# only supported on cc26x0 family (for now).
ifneq (,$(findstring cc26x0,$(CPU_MODEL)))
USEMODULE += cc26x0_driverlib
endif
include ${RIOTCPU}/cc26xx_cc13xx/Makefile.dep include ${RIOTCPU}/cc26xx_cc13xx/Makefile.dep

8
cpu/cc26x0_cc13x0/cpu.c
View File

@ -7,7 +7,7 @@
*/ */
/** /**
* @ingroup cpu_cc26x0 * @ingroup cpu_cc26x0_cc13x0
* @{ * @{
* *
* @file * @file
@ -21,7 +21,9 @@
#include "periph_conf.h" #include "periph_conf.h"
#include "periph/init.h" #include "periph/init.h"
#include "stdio_base.h" #include "stdio_base.h"
#if IS_USED(MODULE_CC26X0_DRIVERLIB)
#include "vendor/driverlib/setup.h" #include "vendor/driverlib/setup.h"
#endif
#ifndef HF_CLOCK_SOURCE #ifndef HF_CLOCK_SOURCE
#define HF_CLOCK_SOURCE DDI_0_OSC_CTL0_SCLK_HF_SRC_SEL_RCOSC /* set 48MHz RCOSC */ #define HF_CLOCK_SOURCE DDI_0_OSC_CTL0_SCLK_HF_SRC_SEL_RCOSC /* set 48MHz RCOSC */
@ -38,12 +40,14 @@ void cpu_init(void)
/* initialize the Cortex-M core */ /* initialize the Cortex-M core */
cortexm_init(); cortexm_init();
#if IS_USED(MODULE_CC26X0_DRIVERLIB)
/* Final trim of device */ /* Final trim of device */
SetupTrimDevice(); SetupTrimDevice();
#endif
/* initialize stdio prior to periph_init() to allow use of DEBUG() there */ /* initialize stdio prior to periph_init() to allow use of DEBUG() there */
stdio_init(); stdio_init();
/* trigger static peripheral initialization */ /* trigger static peripheral initialization */
periph_init(); periph_init();
} }