Merge pull request #15944 from jeandudey/2021_02_08-cc26x0-cc13x0

cpu/cc26x0: rename to cc26x0_cc13x0

boards/cc2650-launchpad/Makefile.features

@@ -1,4 +1,4 @@
-CPU = cc26x0
+CPU = cc26x0_cc13x0
 CPU_MODEL = cc26x0f128
 
 # Put defined MCU peripherals here (in alphabetical order)

boards/cc2650stk/Makefile.features

@@ -1,4 +1,4 @@
-CPU = cc26x0
+CPU = cc26x0_cc13x0
 CPU_MODEL = cc26x0f128
 
 # Put defined MCU peripherals here (in alphabetical order)

cpu/cc26x0/Makefile.dep

@@ -1,4 +0,0 @@
-USEMODULE += cc26xx_cc13xx
-USEMODULE += cc26x0_driverlib
-
-include ${RIOTCPU}/cc26xx_cc13xx/Makefile.dep

cpu/cc26x0/doc.txt

@@ -1,17 +0,0 @@
-/**
- * @defgroup        cpu_cc26x0 TI CC26x0
- * @ingroup         cpu
- * @brief           Texas Instruments CC26x0 Cortex-M3 MCU specific code
- */
-
-/**
- * @defgroup        cpu_specific_peripheral_memory_map TI CC26x0 peripheral memory map
- * @ingroup         cpu
- * @brief           Texas Instruments CC26x0 memory mappings for peripherals
- */
-
-/**
- * @defgroup        cpu_cc26x0_definitions TI CC26x0 definitions
- * @ingroup         cpu_cc26x0
- * @brief           Texas Instruments CC26x0 specific defines
- */

cpu/cc26x0_cc13x0/Kconfig

@@ -9,7 +9,14 @@ config CPU_FAM_CC26X0
     bool
     select CPU_CORE_CORTEX_M3
     select CPU_COMMON_CC26XX_CC13XX
-    select HAS_CPU_CC26X0
+    select HAS_CPU_CC26X0_CC13X0
+    select HAS_CORTEXM_MPU
+
+config CPU_FAM_CC13X0
+    bool
+    select CPU_CORE_CORTEX_M3
+    select CPU_COMMON_CC26XX_CC13XX
+    select HAS_CPU_CC26X0_CC13X0
     select HAS_CORTEXM_MPU
 
 ## CPU Models
@@ -17,20 +24,26 @@ config CPU_MODEL_CC26X0F128
     bool
     select CPU_FAM_CC26X0
 
+config CPU_MODEL_CC13X0F128
+    bool
+    select CPU_FAM_CC13X0
+
 ## Definition of specific features
-config HAS_CPU_CC26X0
+config HAS_CPU_CC26X0_CC13X0
     bool
     help
-        Indicates that a 'cc26x0' cpu is being used.
+        Indicates that a 'cc26x0_cc13x0' cpu is being used.
 
 ## Common CPU symbols
 config CPU_FAM
     default "cc26x0" if CPU_FAM_CC26X0
+    default "cc13x0" if CPU_FAM_CC13X0
 
 config CPU_MODEL
     default "cc26x0f128" if CPU_MODEL_CC26X0F128
+    default "cc13x0f128" if CPU_MODEL_CC13X0F128
 
 config CPU
-    default "cc26x0"
+    default "cc26x0_cc13x0"
 
 source "$(RIOTCPU)/cc26xx_cc13xx/Kconfig"

cpu/cc26x0_cc13x0/Makefile

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

cpu/cc26x0_cc13x0/Makefile.dep

@@ -0,0 +1,8 @@
+USEMODULE += cc26xx_cc13xx
+# 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

cpu/cc26x0_cc13x0/cpu.c

@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     cpu_cc26x0
+ * @ingroup     cpu_cc26x0_cc13x0
  * @{
  *
  * @file
@@ -21,7 +21,9 @@
 #include "periph_conf.h"
 #include "periph/init.h"
 #include "stdio_base.h"
+#if IS_USED(MODULE_CC26X0_DRIVERLIB)
 #include "vendor/driverlib/setup.h"
+#endif
 
 #ifndef HF_CLOCK_SOURCE
 #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 */
     cortexm_init();
 
+#if IS_USED(MODULE_CC26X0_DRIVERLIB)
     /* Final trim of device */
     SetupTrimDevice();
+#endif
 
     /* initialize stdio prior to periph_init() to allow use of DEBUG() there */
     stdio_init();
 
     /* trigger static peripheral initialization */
     periph_init();
-}
+}

cpu/cc26x0_cc13x0/doc.txt

@@ -0,0 +1,17 @@
+/**
+ * @defgroup        cpu_cc26x0_cc13x0 TI CC26x0/CC13x0
+ * @ingroup         cpu
+ * @brief           Texas Instruments CC26x0/CC13x0 Cortex-M3 MCU specific code
+ */
+
+/**
+ * @defgroup        cpu_specific_peripheral_memory_map TI CC26x0/CC13x0 peripheral memory map
+ * @ingroup         cpu
+ * @brief           Texas Instruments CC26x0/CC13x0 memory mappings for peripherals
+ */
+
+/**
+ * @defgroup        cpu_cc26x0_cc13x0_definitions TI CC26x0/CC13x0 definitions
+ * @ingroup         cpu_cc26x0_cc13x0
+ * @brief           Texas Instruments CC26x0 specific defines
+ */

cpu/cc26x0_cc13x0/include/cc26x0_cc13x0_aux.h

@@ -6,15 +6,15 @@
  * details.
  */
 /**
- * @ingroup         cpu_cc26x0_definitions
+ * @ingroup         cpu_cc26x0_cc13x0_definitions
  * @{
  *
  * @file
- * @brief           CC26x0 AUX register definitions
+ * @brief           CC26x0/CC13x0 AUX register definitions
  */
 
-#ifndef CC26X0_AUX_H
-#define CC26X0_AUX_H
+#ifndef CC26X0_CC13X0_AUX_H
+#define CC26X0_CC13X0_AUX_H
 
 #include <stdbool.h>
 
@@ -253,6 +253,5 @@ typedef struct {
 } /* end extern "C" */
 #endif
 
-#endif /* CC26X0_AUX_H */
-
+#endif /* CC26X0_CC13X0_AUX_H */
 /** @}*/

cpu/cc26x0_cc13x0/include/cc26x0_cc13x0_fcfg.h

@@ -6,15 +6,15 @@
  * details.
  */
 /**
- * @ingroup         cpu_cc26x0_definitions
+ * @ingroup         cpu_cc26x0_cc13x0_definitions
  * @{
  *
  * @file
- * @brief           CC26x0 FCFG register definitions
+ * @brief           CC26x0/CC13x0 FCFG register definitions
  */
 
-#ifndef CC26X0_FCFG_H
-#define CC26X0_FCFG_H
+#ifndef CC26X0_CC13X0_FCFG_H
+#define CC26X0_CC13X0_FCFG_H
 
 #include <cc26xx_cc13xx.h>
 
@@ -134,6 +134,5 @@ typedef struct {
 } /* end extern "C" */
 #endif
 
-#endif /* CC26X0_FCFG_H */
-
-/*@}*/
+#endif /* CC26X0_CC13X0_FCFG_H */
+/** @} */

cpu/cc26x0_cc13x0/include/cc26x0_cc13x0_prcm.h

@@ -7,15 +7,15 @@
  */
 
 /**
- * @ingroup         cpu_cc26x0_definitions
+ * @ingroup         cpu_cc26x0_cc13x0_definitions
  * @{
  *
  * @file
- * @brief           CC26x0 PRCM register definitions
+ * @brief           CC26x0/CC13x0 PRCM register definitions
  */
 
-#ifndef CC26X0_PRCM_H
-#define CC26X0_PRCM_H
+#ifndef CC26X0_CC13X0_PRCM_H
+#define CC26X0_CC13X0_PRCM_H
 
 #include <cc26xx_cc13xx.h>
 
@@ -355,6 +355,5 @@ typedef struct {
 } /* end extern "C" */
 #endif
 
-#endif /* CC26X0_PRCM_H */
-
-/*@}*/
+#endif /* CC26X0_CC13X0_PRCM_H */
+/** @} */

cpu/cc26x0_cc13x0/include/cpu_conf.h

@@ -7,7 +7,7 @@
  */
 
 /**
- * @addtogroup      cpu_cc26x0
+ * @addtogroup      cpu_cc26x0_cc13x0
  * @{
  *
  * @file
@@ -31,9 +31,9 @@
 
 #include "cpu_conf_cc26xx_cc13xx.h"
 
-#include "cc26x0_aux.h"
-#include "cc26x0_fcfg.h"
-#include "cc26x0_prcm.h"
+#include "cc26x0_cc13x0_aux.h"
+#include "cc26x0_cc13x0_fcfg.h"
+#include "cc26x0_cc13x0_prcm.h"
 
 /**
  * @brief   Bit-Band configuration

cpu/cc26x0_cc13x0/include/periph_cpu.h

@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup         cpu_cc26x0
+ * @ingroup         cpu_cc26x0_cc13x0
  * @{
  *
  * @file

cpu/cc26x0_cc13x0/vendor/driverlib/aon_rtc.h

@@ -65,7 +65,7 @@ extern "C"
 #include "../inc/hw_memmap.h"
 #include "../inc/hw_aon_rtc.h"
 #include "debug.h"
-#include "../../include/cc26x0_prcm.h"
+#include "../../include/cc26x0_cc13x0_prcm.h"
 
 //*****************************************************************************
 //

cpu/cc26x0_cc13x0/vendor/driverlib/aon_wuc.h

@@ -68,7 +68,7 @@ extern "C"
 #include "../inc/hw_aon_rtc.h"
 #include "interrupt.h"
 #include "debug.h"
-#include "../../include/cc26x0_prcm.h"
+#include "../../include/cc26x0_cc13x0_prcm.h"
 
 //*****************************************************************************
 //

cpu/cc26x0_cc13x0/vendor/driverlib/chipinfo.h

@@ -64,7 +64,7 @@ extern "C"
 #include "../inc/hw_types.h"
 #include "../inc/hw_memmap.h"
 #include "../inc/hw_fcfg1.h"
-#include "../../include/cc26x0_prcm.h"
+#include "../../include/cc26x0_cc13x0_prcm.h"
 
 //*****************************************************************************
 //

cpu/cc26x0_cc13x0/vendor/driverlib/sys_ctrl.h

@@ -81,7 +81,7 @@ extern "C"
 #include "debug.h"
 //#include "pwr_ctrl.h"
 #include "osc.h"
-#include "../../include/cc26x0_prcm.h"
+#include "../../include/cc26x0_cc13x0_prcm.h"
 #include "aux_wuc.h"
 #include "aon_wuc.h"
 //#include "adi.h"