diff --git a/arch/cpu/arm/cortex-m/cm4/Makefile.cm4 b/arch/cpu/arm/cortex-m/cm4/Makefile.cm4
index 0635a3148..110e0697b 100644
--- a/arch/cpu/arm/cortex-m/cm4/Makefile.cm4
+++ b/arch/cpu/arm/cortex-m/cm4/Makefile.cm4
@@ -2,7 +2,7 @@ CONTIKI_ARM_DIRS += cortex-m/cm4
 
 CFLAGS += -mcpu=cortex-m4
 
-LDFLAGS += -mcpu=cortex-m4 -nostartfiles
+LDFLAGS += -mcpu=cortex-m4
 LDFLAGS += -T $(LDSCRIPT)
 LDFLAGS += -Wl,--gc-sections,--sort-section=alignment
 LDFLAGS += -Wl,-Map=$(CONTIKI_NG_PROJECT_MAP),--cref,--no-warn-mismatch
@@ -19,12 +19,10 @@ CUSTOM_RULE_LINK = 1
 
 ### Resolve any potential circular dependencies between the linked libraries
 ### See: https://stackoverflow.com/questions/5651869/gcc-what-are-the-start-group-and-end-group-command-line-options/5651895
-TARGET_LIBFLAGS := -Wl,--start-group $(TARGET_LIBFILES) -lm -Wl,--end-group
+TARGET_LIBFLAGS := -Wl,--start-group $(TARGET_LIBFILES) -Wl,--end-group
 
-.SECONDEXPANSION:
-
-%.elf: $(CPU_STARTFILES) $$(CONTIKI_OBJECTFILES) %.o $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(LDSCRIPT)
+%.elf: $(CPU_STARTFILES) %.o $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(CONTIKI_NG_TARGET_LIB) $(TARGET_LIBS)
 	$(TRACE_LD)
-	$(Q)$(LD) $(LDFLAGS) ${filter-out $(LDSCRIPT) %.a,$^} ${filter %.a,$^} $(TARGET_LIBFLAGS) -o $@
+	$(Q)$(LD) $(LDFLAGS) ${filter %.o %.a,$^} $(TARGET_LIBFLAGS) -o $@
 
 include $(CONTIKI)/arch/cpu/arm/cortex-m/Makefile.cortex-m
diff --git a/arch/cpu/nrf52832/Makefile.nrf52832 b/arch/cpu/nrf52832/Makefile.nrf52832
index 3765484d8..c97c728e5 100644
--- a/arch/cpu/nrf52832/Makefile.nrf52832
+++ b/arch/cpu/nrf52832/Makefile.nrf52832
@@ -25,9 +25,9 @@ ifneq ($(NRF52_WITHOUT_SOFTDEVICE),1)
     NRF52_SOFTDEVICE := $(shell find $(NRF52_SDK_ROOT) -name *iot*_softdevice.hex | head -n 1)
   endif
   $(info SoftDevice: $(NRF52_SOFTDEVICE))
-  LINKER_SCRIPT := $(CONTIKI_CPU)/ld/nrf52-$(NRF52_DK_REVISION)-sd.ld
+  LDSCRIPT := $(CONTIKI_CPU)/ld/nrf52-$(NRF52_DK_REVISION)-sd.ld
 else
-  LINKER_SCRIPT := $(CONTIKI_CPU)/ld/nrf52.ld
+  LDSCRIPT := $(CONTIKI_CPU)/ld/nrf52.ld
 endif
 
 OUTPUT_FILENAME := $(CONTIKI_PROJECT)
@@ -140,7 +140,7 @@ CFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
 
 # keep every function in separate section. This will allow linker to dump unused functions
 LDFLAGS += -Xlinker -Map=$(CONTIKI_NG_PROJECT_MAP)
-LDFLAGS += -mabi=aapcs -L $(TEMPLATE_PATH) -T$(LINKER_SCRIPT)
+LDFLAGS += -mabi=aapcs -L $(TEMPLATE_PATH)
 LDFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
 # let linker to dump unused sections
 LDFLAGS += -Wl,--gc-sections
@@ -174,7 +174,7 @@ OBJECTS = $(C_OBJECTS) $(ASM_OBJECTS)
 
 CLEAN += nrf52832.a
 
-TARGET_LIBS= nrf52832.a $(NRF52_SDK_ROOT)/components/iot/ble_6lowpan/lib/ble_6lowpan.a
+TARGET_LIBS = nrf52832.a $(NRF52_SDK_ROOT)/components/iot/ble_6lowpan/lib/ble_6lowpan.a
 
 nrf52832.a: $(OBJECTS)
 	$(TRACE_AR)
diff --git a/arch/cpu/simplelink-cc13xx-cc26xx/Makefile.cc13xx-cc26xx b/arch/cpu/simplelink-cc13xx-cc26xx/Makefile.cc13xx-cc26xx
index 19b3689e8..3eb11182d 100644
--- a/arch/cpu/simplelink-cc13xx-cc26xx/Makefile.cc13xx-cc26xx
+++ b/arch/cpu/simplelink-cc13xx-cc26xx/Makefile.cc13xx-cc26xx
@@ -118,14 +118,15 @@ CFLAGS += -fno-common
 
 # Linker flags
 LDFLAGS += --entry resetISR
-LDFLAGS += -static
 LDFLAGS += --specs=nano.specs
+LDFLAGS += -nostartfiles
+LDFLAGS += -static
 
 # Linker script
 LDSCRIPT := $(CONTIKI_CPU)/$(SUBFAMILY)/$(SUBFAMILY).lds
 
 # Globally linked libraries
-TARGET_LIBFILES += -lc -lgcc -lnosys
+TARGET_LIBFILES += -lc -lgcc -lnosys -lm
 
 ################################################################################
 ### Specialized build targets
diff --git a/arch/cpu/simplelink-cc13xx-cc26xx/cc13x2-cc26x2/Makefile.cc13x2-cc26x2 b/arch/cpu/simplelink-cc13xx-cc26xx/cc13x2-cc26x2/Makefile.cc13x2-cc26x2
index ede55d4bc..52333f47d 100644
--- a/arch/cpu/simplelink-cc13xx-cc26xx/cc13x2-cc26x2/Makefile.cc13x2-cc26x2
+++ b/arch/cpu/simplelink-cc13xx-cc26xx/cc13x2-cc26x2/Makefile.cc13x2-cc26x2
@@ -7,5 +7,5 @@ TARGET_LIBFILES += $(SDK_DRIVERS)/rf/lib/rf_multiMode_$(SDK_LIB_NAME).am4fg
 TARGET_LIBFILES += $(SDK_DRIVERS)/lib/drivers_$(SDK_LIB_NAME).am4fg
 TARGET_LIBFILES += $(SDK_DEVICES)/driverlib/bin/gcc/driverlib.lib
 
-# CC13x0/CC26x0 is a Cortex-M4 architecture
+# CC13x2/CC26x2 is a Cortex-M4 architecture
 include $(CONTIKI)/arch/cpu/arm/cortex-m/cm4/Makefile.cm4
diff --git a/arch/cpu/simplelink-cc13xx-cc26xx/ccfg-conf.c b/arch/cpu/simplelink-cc13xx-cc26xx/ccfg-conf.c
index be6c1ed9b..ef83fc29b 100644
--- a/arch/cpu/simplelink-cc13xx-cc26xx/ccfg-conf.c
+++ b/arch/cpu/simplelink-cc13xx-cc26xx/ccfg-conf.c
@@ -31,7 +31,7 @@
  * \addtogroup cc13xx-cc26xx-cpu
  * @{
  *
- * \defgroupt cc13xx-cc26xx-ccfg Customer Configuration (CCFG)
+ * \defgroup cc13xx-cc26xx-ccfg Customer Configuration (CCFG)
  *
  * @{
  *
diff --git a/arch/cpu/simplelink-cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_gcc.c b/arch/cpu/simplelink-cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_gcc.c
index 7c542084b..7b34cd29b 100644
--- a/arch/cpu/simplelink-cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_gcc.c
+++ b/arch/cpu/simplelink-cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_gcc.c
@@ -308,3 +308,4 @@ _fini(void)
   /* Function body left empty intentionally */
 }
 /*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/arch/cpu/simplelink-cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_iar.c b/arch/cpu/simplelink-cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_iar.c
index 84b17ac76..3ea8500c2 100644
--- a/arch/cpu/simplelink-cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_iar.c
+++ b/arch/cpu/simplelink-cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_iar.c
@@ -315,3 +315,4 @@ intDefaultHandler(void)
   for(;;) { /* hang */ }
 }
 /*---------------------------------------------------------------------------*/
+/** @} */
diff --git a/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.c b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.c
index e6771de64..b9e32a04d 100644
--- a/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.c
+++ b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.c
@@ -122,7 +122,7 @@ uint32_t rf_ble_overrides_coded[] CC_ALIGN(4) =
 };
 /*---------------------------------------------------------------------------*/
 /* CMD_BLE5_RADIO_SETUP: Bluetooth 5 Radio Setup Command for all PHYs */
-rfc_CMD_BLE5_RADIO_SETUP_t rf_cmd_ble5_radio_setup =
+rfc_CMD_BLE5_RADIO_SETUP_t rf_ble_cmd_radio_setup =
 {
   .commandNo = CMD_BLE5_RADIO_SETUP,
   .status = IDLE,
@@ -148,8 +148,8 @@ rfc_CMD_BLE5_RADIO_SETUP_t rf_cmd_ble5_radio_setup =
   .pRegOverrideCoded = rf_ble_overrides_coded,
 };
 /*---------------------------------------------------------------------------*/
-/* Structure for CMD_BLE5_ADV_AUX.pParams */
-rfc_ble5AdvAuxPar_t rf_ble5_adv_aux_par =
+/* Structure for CMD_BLE5_ADV_NC.pParams */
+rfc_bleAdvPar_t rf_ble_adv_par =
 {
   .pRxQ = 0,
   .rxConfig.bAutoFlushIgnored = 0x0,
@@ -162,32 +162,36 @@ rfc_ble5AdvAuxPar_t rf_ble5_adv_aux_par =
   .rxConfig.bAppendTimestamp = 0x0,
   .advConfig.advFilterPolicy = 0x0,
   .advConfig.deviceAddrType = 0x0,
-  .advConfig.targetAddrType = 0x0,
+  .advConfig.peerAddrType = 0x0,
   .advConfig.bStrictLenFilter = 0x0,
-  .advConfig.bDirected = 0x0,
-  .advConfig.privIgnMode = 0x0,
   .advConfig.rpaMode = 0x0,
-  .__dummy0 = 0x00,
-  .auxPtrTargetType = 0x00,
-  .auxPtrTargetTime = 0x00000000,
-  .pAdvPkt = 0,
-  .pRspPkt = 0,
+  .advLen = 0x18,
+  .scanRspLen = 0x00,
+  .pAdvData = 0,
+  .pScanRspData = 0,
   .pDeviceAddress = 0,
   .pWhiteList = 0,
+  .__dummy0 = 0x0000,
+  .__dummy1 = 0x00,
+  .endTrigger.triggerType = TRIG_NEVER,
+  .endTrigger.bEnaCmd = 0x0,
+  .endTrigger.triggerNo = 0x0,
+  .endTrigger.pastTrig = 0x0,
+  .endTime = 0x00000000,
 };
 /*---------------------------------------------------------------------------*/
-/* CMD_BLE5_ADV_AUX: Bluetooth 5 Secondary Channel Advertiser Command */
-rfc_CMD_BLE5_ADV_AUX_t rf_cmd_ble5_adv_aux =
+/* CMD_BLE5_ADV_NC: Bluetooth 5 Non-Connectable Advertiser Command */
+rfc_CMD_BLE5_ADV_NC_t rf_ble_cmd_ble_adv_nc =
 {
-  .commandNo = CMD_BLE5_ADV_AUX,
-  .status = IDLE,
-  .pNextOp = 0,
+  .commandNo = 0x182D,
+  .status = 0x0000,
+  .pNextOp = 0, // INSERT APPLICABLE POINTER: (uint8_t*)&xxx
   .startTime = 0x00000000,
-  .startTrigger.triggerType = TRIG_NOW,
+  .startTrigger.triggerType = 0x0,
   .startTrigger.bEnaCmd = 0x0,
   .startTrigger.triggerNo = 0x0,
   .startTrigger.pastTrig = 0x0,
-  .condition.rule = COND_NEVER,
+  .condition.rule = 0x1,
   .condition.nSkip = 0x0,
   .channel = 0x8C,
   .whitening.init = 0x51,
@@ -196,8 +200,8 @@ rfc_CMD_BLE5_ADV_AUX_t rf_cmd_ble5_adv_aux =
   .phyMode.coding = 0x0,
   .rangeDelay = 0x00,
   .txPower = 0x0000,
-  .pParams = &rf_ble5_adv_aux_par,
-  .pOutput = 0,
+  .pParams = &rf_ble_adv_par,
+  .pOutput = 0, // INSERT APPLICABLE POINTER: (uint8_t*)&xxx
   .tx20Power = 0x00000000,
 };
 /*---------------------------------------------------------------------------*/
diff --git a/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.h
index 7793b89e6..2e6defa71 100644
--- a/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.h
+++ b/arch/cpu/simplelink-cc13xx-cc26xx/rf-settings/cc13x2/ble-settings.h
@@ -42,9 +42,9 @@
 extern RF_Mode                    rf_ble_mode;
 /*---------------------------------------------------------------------------*/
 /* RF Core API commands */
-extern rfc_CMD_BLE5_RADIO_SETUP_t rf_cmd_ble5_radio_setup;
-extern rfc_ble5AdvAuxPar_t        rf_ble5_adv_aux_par;
-extern rfc_CMD_BLE5_ADV_AUX_t     rf_cmd_ble5_adv_aux;
+extern rfc_CMD_BLE5_RADIO_SETUP_t rf_ble_cmd_radio_setup;
+extern rfc_bleAdvPar_t            rf_ble_adv_par;
+extern rfc_CMD_BLE5_ADV_NC_t      rf_ble_cmd_ble_adv_nc;
 /*---------------------------------------------------------------------------*/
 /* RF Core API Overrides */
 extern uint32_t                   rf_ble_overrides_common[];
diff --git a/arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-addr.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-addr.h
index 7fb45b1f2..fd63c17d0 100644
--- a/arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-addr.h
+++ b/arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-addr.h
@@ -93,3 +93,7 @@ int ble_addr_to_eui64_cpy(uint8_t *dst);
 /*---------------------------------------------------------------------------*/
 #endif /* BLE_ADDR_H_ */
 /*---------------------------------------------------------------------------*/
+/**
+ * @}
+ * @}
+ */
\ No newline at end of file
diff --git a/arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-beacond.h b/arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-beacond.h
index c273ad1c1..7741a2d71 100644
--- a/arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-beacond.h
+++ b/arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-beacond.h
@@ -55,13 +55,7 @@ typedef enum {
 } rf_ble_beacond_result_t;
 /*---------------------------------------------------------------------------*/
 /**
- * \brief Set the device name to use with the BLE advertisement/beacon daemon
- * \param interval The interval (ticks) between two consecutive beacon bursts
- * \param name The device name to advertise
- *
- * If name is NULL it will be ignored. If interval==0 it will be ignored. Thus,
- * this function can be used to configure a single parameter at a time if so
- * desired.
+ * \brief Initialize the BLE advertisement/beacon daemon
  */
 rf_ble_beacond_result_t rf_ble_beacond_init(void);
 
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL.h
index b1066711b..f2c1638d7 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL.h
@@ -167,7 +167,7 @@ typedef enum CC1310_LAUNCHXL_ADCBufName {
 } CC1310_LAUNCHXL_ADCBufName;
 
 /*!
- *  @def    CC1310_LAUNCHXL_ADCBuf0SourceName
+ *  @def    CC1310_LAUNCHXL_ADCBuf0ChannelName
  *  @brief  Enum of ADCBuf channels
  */
 typedef enum CC1310_LAUNCHXL_ADCBuf0ChannelName {
@@ -290,7 +290,7 @@ typedef enum CC1310_LAUNCHXL_NVSName {
 } CC1310_LAUNCHXL_NVSName;
 
 /*!
- *  @def    CC1310_LAUNCHXL_PWM
+ *  @def    CC1310_LAUNCHXL_PWMName
  *  @brief  Enum of PWM outputs
  */
 typedef enum CC1310_LAUNCHXL_PWMName {
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL.h
index a6e5e3bbf..0295dc0b4 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL.h
@@ -176,7 +176,7 @@ typedef enum CC1312R1_LAUNCHXL_ADCBufName {
 } CC1312R1_LAUNCHXL_ADCBufName;
 
 /*!
- *  @def    CC1312R1_LAUNCHXL_ADCBuf0SourceName
+ *  @def    CC1312R1_LAUNCHXL_ADCBuf0ChannelName
  *  @brief  Enum of ADCBuf channels
  */
 typedef enum CC1312R1_LAUNCHXL_ADCBuf0ChannelName {
@@ -349,7 +349,7 @@ typedef enum CC1312R1_LAUNCHXL_NVSName {
 } CC1312R1_LAUNCHXL_NVSName;
 
 /*!
- *  @def    CC1312R1_LAUNCHXL_PWM
+ *  @def    CC1312R1_LAUNCHXL_PWMName
  *  @brief  Enum of PWM outputs
  */
 typedef enum CC1312R1_LAUNCHXL_PWMName {
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433.h
index 479b81a71..5377700d5 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433.h
@@ -170,7 +170,7 @@ typedef enum CC1350_LAUNCHXL_433_ADCBufName {
 } CC1350_LAUNCHXL_433_ADCBufName;
 
 /*!
- *  @def    CC1350_LAUNCHXL_433_ADCBuf0SourceName
+ *  @def    CC1350_LAUNCHXL_433_ADCBuf0ChannelName
  *  @brief  Enum of ADCBuf channels
  */
 typedef enum CC1350_LAUNCHXL_433_ADCBuf0ChannelName {
@@ -291,7 +291,7 @@ typedef enum CC1350_LAUNCHXL_433_NVSName {
 } CC1350_LAUNCHXL_433_NVSName;
 
 /*!
- *  @def    CC1350_LAUNCHXL_433_PWM
+ *  @def    CC1350_LAUNCHXL_433_PWMName
  *  @brief  Enum of PWM outputs
  */
 typedef enum CC1350_LAUNCHXL_433_PWMName {
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL.h
index f711874c2..9167a15c3 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL.h
@@ -170,7 +170,7 @@ typedef enum CC1350_LAUNCHXL_ADCBufName {
 } CC1350_LAUNCHXL_ADCBufName;
 
 /*!
- *  @def    CC1350_LAUNCHXL_ADCBuf0SourceName
+ *  @def    CC1350_LAUNCHXL_ADCBuf0ChannelName
  *  @brief  Enum of ADCBuf channels
  */
 typedef enum CC1350_LAUNCHXL_ADCBuf0ChannelName {
@@ -293,7 +293,7 @@ typedef enum CC1350_LAUNCHXL_NVSName {
 } CC1350_LAUNCHXL_NVSName;
 
 /*!
- *  @def    CC1350_LAUNCHXL_PWM
+ *  @def    CC1350_LAUNCHXL_PWMName
  *  @brief  Enum of PWM outputs
  */
 typedef enum CC1350_LAUNCHXL_PWMName {
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL.h
index 29e089cfb..a3defe845 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL.h
@@ -191,7 +191,7 @@ typedef enum CC1352P_2_LAUNCHXL_ADCBufName {
 } CC1352P_2_LAUNCHXL_ADCBufName;
 
 /*!
- *  @def    CC1352P_2_LAUNCHXL_ADCBuf0SourceName
+ *  @def    CC1352P_2_LAUNCHXL_ADCBuf0ChannelName
  *  @brief  Enum of ADCBuf channels
  */
 typedef enum CC1352P_2_LAUNCHXL_ADCBuf0ChannelName {
@@ -358,7 +358,7 @@ typedef enum CC1352P_2_LAUNCHXL_NVSName {
 } CC1352P_2_LAUNCHXL_NVSName;
 
 /*!
- *  @def    CC1352P_2_LAUNCHXL_PWM
+ *  @def    CC1352P_2_LAUNCHXL_PWMName
  *  @brief  Enum of PWM outputs
  */
 typedef enum CC1352P_2_LAUNCHXL_PWMName {
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL.h
index bce1bb54a..d33d50847 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL.h
@@ -191,7 +191,7 @@ typedef enum CC1352P_4_LAUNCHXL_ADCBufName {
 } CC1352P_4_LAUNCHXL_ADCBufName;
 
 /*!
- *  @def    CC1352P_4_LAUNCHXL_ADCBuf0SourceName
+ *  @def    CC1352P_4_LAUNCHXL_ADCBuf0ChannelName
  *  @brief  Enum of ADCBuf channels
  */
 typedef enum CC1352P_4_LAUNCHXL_ADCBuf0ChannelName {
@@ -358,7 +358,7 @@ typedef enum CC1352P_4_LAUNCHXL_NVSName {
 } CC1352P_4_LAUNCHXL_NVSName;
 
 /*!
- *  @def    CC1352P_4_LAUNCHXL_PWM
+ *  @def    CC1352P_4_LAUNCHXL_PWMName
  *  @brief  Enum of PWM outputs
  */
 typedef enum CC1352P_4_LAUNCHXL_PWMName {
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL.h
index f5fa59fe7..067a3ea87 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL.h
@@ -191,7 +191,7 @@ typedef enum CC1352P1_LAUNCHXL_ADCBufName {
 } CC1352P1_LAUNCHXL_ADCBufName;
 
 /*!
- *  @def    CC1352P1_LAUNCHXL_ADCBuf0SourceName
+ *  @def    CC1352P1_LAUNCHXL_ADCBuf0ChannelName
  *  @brief  Enum of ADCBuf channels
  */
 typedef enum CC1352P1_LAUNCHXL_ADCBuf0ChannelName {
@@ -362,7 +362,7 @@ typedef enum CC1352P1_LAUNCHXL_NVSName {
 } CC1352P1_LAUNCHXL_NVSName;
 
 /*!
- *  @def    CC1352P1_LAUNCHXL_PWM
+ *  @def    CC1352P1_LAUNCHXL_PWMName
  *  @brief  Enum of PWM outputs
  */
 typedef enum CC1352P1_LAUNCHXL_PWMName {
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL.h
index f0d94306b..b6362cf9f 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL.h
@@ -182,7 +182,7 @@ typedef enum CC1352R1_LAUNCHXL_ADCBufName {
 } CC1352R1_LAUNCHXL_ADCBufName;
 
 /*!
- *  @def    CC1352R1_LAUNCHXL_ADCBuf0SourceName
+ *  @def    CC1352R1_LAUNCHXL_ADCBuf0ChannelName
  *  @brief  Enum of ADCBuf channels
  */
 typedef enum CC1352R1_LAUNCHXL_ADCBuf0ChannelName {
@@ -353,7 +353,7 @@ typedef enum CC1352R1_LAUNCHXL_NVSName {
 } CC1352R1_LAUNCHXL_NVSName;
 
 /*!
- *  @def    CC1352R1_LAUNCHXL_PWM
+ *  @def    CC1352R1_LAUNCHXL_PWMName
  *  @brief  Enum of PWM outputs
  */
 typedef enum CC1352R1_LAUNCHXL_PWMName {
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL.h
index 90bf27d38..8c440aa9d 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL.h
@@ -167,7 +167,7 @@ typedef enum CC2650_LAUNCHXL_ADCBufName {
 } CC2650_LAUNCHXL_ADCBufName;
 
 /*!
- *  @def    CC2650_LAUNCHXL_ADCBuf0SourceName
+ *  @def    CC2650_LAUNCHXL_ADCBuf0ChannelName
  *  @brief  Enum of ADCBuf channels
  */
 typedef enum CC2650_LAUNCHXL_ADCBuf0ChannelName {
@@ -290,7 +290,7 @@ typedef enum CC2650_LAUNCHXL_NVSName {
 } CC2650_LAUNCHXL_NVSName;
 
 /*!
- *  @def    CC2650_LAUNCHXL_PWM
+ *  @def    CC2650_LAUNCHXL_PWMName
  *  @brief  Enum of PWM outputs
  */
 typedef enum CC2650_LAUNCHXL_PWMName {
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL.h
index 040d9fb50..840d937e7 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL.h
@@ -182,7 +182,7 @@ typedef enum CC26X2R1_LAUNCHXL_ADCBufName {
 } CC26X2R1_LAUNCHXL_ADCBufName;
 
 /*!
- *  @def    CC26X2R1_LAUNCHXL_ADCBuf0SourceName
+ *  @def    CC26X2R1_LAUNCHXL_ADCBuf0ChannelName
  *  @brief  Enum of ADCBuf channels
  */
 typedef enum CC26X2R1_LAUNCHXL_ADCBuf0ChannelName {
@@ -355,7 +355,7 @@ typedef enum CC26X2R1_LAUNCHXL_NVSName {
 } CC26X2R1_LAUNCHXL_NVSName;
 
 /*!
- *  @def    CC26X2R1_LAUNCHXL_PWM
+ *  @def    CC26X2R1_LAUNCHXL_PWMName
  *  @brief  Enum of PWM outputs
  */
 typedef enum CC26X2R1_LAUNCHXL_PWMName {
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/bmp-280-sensor.c b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/bmp-280-sensor.c
index 7c6b0f2f1..bf47c1571 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/bmp-280-sensor.c
+++ b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/bmp-280-sensor.c
@@ -234,7 +234,8 @@ enable_sensor(bool enable)
 /**
  * \brief          Read temperature and pressure data.
  * \param data     Pointer to a buffer where temperature and pressure will be
- *                 written (6 bytes).
+ *                 written.
+ * \param count    Number of byes to read.
  * \return Boolean Value descibing whether initialization were
  *                 successful or not.
  * \retval true    Successful initialization
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/CC1350STK.h b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/CC1350STK.h
index dae1c7739..2347876b1 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/CC1350STK.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/CC1350STK.h
@@ -256,7 +256,7 @@ typedef enum CC1350STK_NVSName {
 } CC1350STK_NVSName;
 
 /*!
- *  @def    CC1350STK_PdmName
+ *  @def    CC1350STK_PDMName
  *  @brief  Enum of PDM names
  */
 typedef enum CC1350STK_PDMName {
@@ -266,7 +266,7 @@ typedef enum CC1350STK_PDMName {
 } CC1350STK_PDMName;
 
 /*!
- *  @def    CC1350STK_PWM
+ *  @def    CC1350STK_PWMName
  *  @brief  Enum of PWM outputs
  */
 typedef enum CC1350STK_PWMName {
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc2650/CC2650STK.h b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc2650/CC2650STK.h
index 8dc1a9326..17533f6cd 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc2650/CC2650STK.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc2650/CC2650STK.h
@@ -257,7 +257,7 @@ typedef enum CC2650STK_NVSName {
 } CC2650STK_NVSName;
 
 /*!
- *  @def    CC2650STK_PdmName
+ *  @def    CC2650STK_PDMName
  *  @brief  Enum of PDM names
  */
 typedef enum CC2650STK_PDMName {
@@ -267,7 +267,7 @@ typedef enum CC2650STK_PDMName {
 } CC2650STK_PDMName;
 
 /*!
- *  @def    CC2650STK_PWM
+ *  @def    CC2650STK_PWMName
  *  @brief  Enum of PWM outputs
  */
 typedef enum CC2650STK_PWMName {
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/tmp-007-sensor.c b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/tmp-007-sensor.c
index 68bd4669a..7e08006ea 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/tmp-007-sensor.c
+++ b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/tmp-007-sensor.c
@@ -241,12 +241,12 @@ enable_sensor(bool enable)
 }
 /*---------------------------------------------------------------------------*/
 /**
- * \brief               Read the sensor value registers.
- * \param raw_temp      Output variable holding the Temperature in
- *                      16-bit format.
- * \param raw_obj_temp  Output variable holding the Object temperature in
- *                      16-bit format.
- * \return              true if valid data could be retrieved; else, false.
+ * \brief            Read the sensor value registers.
+ * \param local_tmp  Output variable holding the Temperature in
+ *                   16-bit format.
+ * \param obj_tmp    Output variable holding the Object temperature in
+ *                   16-bit format.
+ * \return           true if valid data could be retrieved; else, false.
  */
 static bool
 read_data(uint16_t *local_tmp, uint16_t *obj_tmp)
@@ -292,11 +292,11 @@ read_data(uint16_t *local_tmp, uint16_t *obj_tmp)
 }
 /*---------------------------------------------------------------------------*/
 /**
- * \brief               Convert raw data to values in degrees Celsius.
- * \param raw_temp      Output variable holding the raw ambient temperature
- *                      from sensor.
- * \param raw_obj_temp  Output variable holding the raw object temperature
- *                      from sensor.
+ * \brief            Convert raw data to values in degrees Celsius.
+ * \param local_tmp  Output variable holding the raw ambient temperature
+ *                   from sensor.
+ * \param obj_tmp    Output variable holding the raw object temperature
+ *                   from sensor.
  */
 static void
 convert(uint16_t *local_tmp, uint16_t *obj_tmp)
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD.h b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD.h
index b531041cb..4c705abe5 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD.h
@@ -178,7 +178,7 @@ typedef enum CC1350DK_7XD_ADCBufName {
 } CC1350DK_7XD_ADCBufName;
 
 /*!
- *  @def    CC1350DK_7XD_ADCBuf0SourceName
+ *  @def    CC1350DK_7XD_ADCBuf0ChannelName
  *  @brief  Enum of ADCBuf channels
  */
 typedef enum CC1350DK_7XD_ADCBuf0ChannelName {
@@ -290,7 +290,7 @@ typedef enum CC1350DK_7XD_NVSName {
 } CC1350DK_7XD_NVSName;
 
 /*!
- *  @def    CC1350DK_7XD_PWM
+ *  @def    CC1350DK_7XD_PWMName
  *  @brief  Enum of PWM outputs
  */
 typedef enum CC1350DK_7XD_PWMName {
diff --git a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID.h b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID.h
index a48531407..21bae0eed 100644
--- a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID.h
+++ b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID.h
@@ -178,7 +178,7 @@ typedef enum CC2650DK_7ID_ADCBufName {
 } CC2650DK_7ID_ADCBufName;
 
 /*!
- *  @def    CC2650DK_7ID_ADCBuf0SourceName
+ *  @def    CC2650DK_7ID_ADCBuf0ChannelName
  *  @brief  Enum of ADCBuf channels
  */
 typedef enum CC2650DK_7ID_ADCBuf0ChannelName {
@@ -290,7 +290,7 @@ typedef enum CC2650DK_7ID_NVSName {
 } CC2650DK_7ID_NVSName;
 
 /*!
- *  @def    CC2650DK_7ID_PWM
+ *  @def    CC2650DK_7ID_PWMName
  *  @brief  Enum of PWM outputs
  */
 typedef enum CC2650DK_7ID_PWMName {
diff --git a/tools/doxygen/Doxyfile b/tools/doxygen/Doxyfile
index db2efa697..dab2c18e3 100644
--- a/tools/doxygen/Doxyfile
+++ b/tools/doxygen/Doxyfile
@@ -809,10 +809,10 @@ EXCLUDE_SYMLINKS       = NO
 
 EXCLUDE_PATTERNS       = */cpu/cc26xx-cc13xx/lib/* \
                          */cpu/cc26xx-cc13xx/rf-core/api/* \
-                         */cpu/cc13xx-cc26xx/lib/* \
-                         */cpu/cc13xx-cc26xx/rf-settings/* \
-                         */cpu/cc13xx-cc26xx/cc13x0-cc26x0/driverlib/* \
-                         */cpu/cc13xx-cc26xx/cc13x0-cc26x0/rf_patches/* \
+                         */cpu/simplelink-cc13xx-cc26xx/lib/* \
+                         */cpu/simplelink-cc13xx-cc26xx/rf-settings/* \
+                         */cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/driverlib/* \
+                         */cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/rf_patches/* \
                          */platform/stm32nucleo-spirit1/stm32cube-lib/* \
                          */os/net/security/tinydtls/*