diff --git a/cpu/cc26xx/dev/cc26xx-rf.c b/cpu/cc26xx/dev/cc26xx-rf.c
index 2f874ceef..f68a2a0c8 100644
--- a/cpu/cc26xx/dev/cc26xx-rf.c
+++ b/cpu/cc26xx/dev/cc26xx-rf.c
@@ -464,7 +464,7 @@ rf_is_accessible(void)
 {
   if(ti_lib_prcm_rf_ready() &&
      ti_lib_prcm_power_domain_status(PRCM_DOMAIN_RFCORE) ==
-         PRCM_DOMAIN_POWER_ON) {
+     PRCM_DOMAIN_POWER_ON) {
     return 1;
   }
   return 0;
diff --git a/cpu/cc26xx/dev/cc26xx-rf.h b/cpu/cc26xx/dev/cc26xx-rf.h
index 4087a037d..a278e085d 100644
--- a/cpu/cc26xx/dev/cc26xx-rf.h
+++ b/cpu/cc26xx/dev/cc26xx-rf.h
@@ -66,7 +66,7 @@
 #define CC26XX_RF_AUTOACK 1
 #endif /* CC26XX_RF_CONF_AUTOACK */
 
-#if defined (CC26XX_RF_CONF_BLE_SUPPORT) && (CC26XX_MODEL_CPU_VARIANT == 2650)
+#if (CC26XX_RF_CONF_BLE_SUPPORT) && (CC26XX_MODEL_CPU_VARIANT == 2650)
 #define CC26XX_RF_BLE_SUPPORT CC26XX_RF_CONF_BLE_SUPPORT
 #else
 #define CC26XX_RF_BLE_SUPPORT 0
diff --git a/cpu/cc26xx/dev/cc26xx-rtc.c b/cpu/cc26xx/dev/cc26xx-rtc.c
index b06aebd22..b1b01ea6e 100644
--- a/cpu/cc26xx/dev/cc26xx-rtc.c
+++ b/cpu/cc26xx/dev/cc26xx-rtc.c
@@ -91,7 +91,7 @@ cc26xx_rtc_get_next_trigger()
   if(HWREG(AON_RTC_BASE + AON_RTC_O_CHCTL) & AON_RTC_CHCTL_CH0_EN) {
     rtimer_clock_t ch0 = ti_lib_aon_rtc_compare_value_get(AON_RTC_CH2);
 
-    return RTIMER_CLOCK_LT(ch0 ,ch2) ? ch0 : ch2;
+    return RTIMER_CLOCK_LT(ch0, ch2) ? ch0 : ch2;
   }
 
   return ch2;
diff --git a/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c b/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c
index 91f921b9d..5d83add4f 100644
--- a/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c
+++ b/examples/cc26xx/cc26xx-web-demo/cc26xx-web-demo.c
@@ -852,7 +852,7 @@ PROCESS_THREAD(cc26xx_web_demo_process, ev, data)
   while(1) {
     if(ev == sensors_event && data == CC26XX_WEB_DEMO_SENSOR_READING_TRIGGER) {
       if((CC26XX_WEB_DEMO_SENSOR_READING_TRIGGER)->value(
-          BUTTON_SENSOR_VALUE_DURATION) > CLOCK_SECOND * 5) {
+           BUTTON_SENSOR_VALUE_DURATION) > CLOCK_SECOND * 5) {
         printf("Restoring defaults!\n");
         cc26xx_web_demo_restore_defaults();
       } else {
diff --git a/platform/srf06-cc26xx/README.md b/platform/srf06-cc26xx/README.md
index 4cfb9945d..4cc82ecfe 100644
--- a/platform/srf06-cc26xx/README.md
+++ b/platform/srf06-cc26xx/README.md
@@ -75,9 +75,10 @@ the section ["Drivers" in the CC2538DK readme](https://github.com/contiki-os/con
 
 Environment
 ===========
-To use this port, you will need to download and extract CC26xxware sources, 
-provided by TI here http://www.ti.com/tool/cc26xxware. Once you have done this, you will need to configure the Contiki
-build system so that it can locate and compile them as part of the build process.
+To use this port, you will need to download and extract CC26xxware sources,
+provided by TI here http://www.ti.com/tool/cc26xxware. Once you have done this,
+you will need to configure the Contiki build system so that it can locate and
+compile them as part of the build process.
 
 To do this, you will need to set the following environment variable:
 
diff --git a/platform/srf06-cc26xx/contiki-conf.h b/platform/srf06-cc26xx/contiki-conf.h
index 6a99c29b3..6bb93db7f 100644
--- a/platform/srf06-cc26xx/contiki-conf.h
+++ b/platform/srf06-cc26xx/contiki-conf.h
@@ -244,10 +244,6 @@
 #ifndef ENERGEST_CONF_ON
 #define ENERGEST_CONF_ON            0 /**< Energest Module */
 #endif
-
-#ifndef STARTUP_CONF_VERBOSE
-#define STARTUP_CONF_VERBOSE        1 /**< Set to 0 to decrease startup verbosity */
-#endif
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
@@ -273,29 +269,10 @@
  * This will keep working while UIP_FALLBACK_INTERFACE and CMD_CONF_OUTPUT
  * keep using SLIP
  */
-#if defined (UIP_FALLBACK_INTERFACE) || defined (CMD_CONF_OUTPUT)
+#if defined(UIP_FALLBACK_INTERFACE) || defined(CMD_CONF_OUTPUT)
 #define SLIP_ARCH_CONF_ENABLED             1
 #endif
 #endif
-
-/**
- * \brief Define this as 1 to build a headless node.
- *
- * The UART will not be initialised its clock will be gated, offering some
- * energy savings. The USB will not be initialised either
- */
-#ifndef CC26XX_CONF_QUIET
-#define CC26XX_CONF_QUIET                  0
-#endif
-
-/* CC26XX_CONF_QUIET is hard and overrides all other related defines */
-#if CC26XX_CONF_QUIET
-#undef CC26XX_UART_CONF_ENABLE
-#define CC26XX_UART_CONF_ENABLE            0
-
-#undef STARTUP_CONF_VERBOSE
-#define STARTUP_CONF_VERBOSE               0
-#endif /* CC26XX_CONF_QUIET */
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
@@ -332,14 +309,14 @@ typedef uint32_t clock_time_t;
 typedef uint32_t uip_stats_t;
 
 /* Clock (time) comparison macro */
-#define CLOCK_LT(a,b)  ((signed long)((a)-(b)) < 0)
+#define CLOCK_LT(a, b)  ((signed long)((a) - (b)) < 0)
 
 /*
  * rtimer.h typedefs rtimer_clock_t as unsigned short. We need to define
  * RTIMER_CLOCK_LT to override this
  */
 typedef uint32_t rtimer_clock_t;
-#define RTIMER_CLOCK_LT(a,b)     ((int32_t)((a)-(b)) < 0)
+#define RTIMER_CLOCK_LT(a, b)     ((int32_t)((a) - (b)) < 0)
 /** @} */
 /*---------------------------------------------------------------------------*/
 /* board.h assumes that basic configuration is done */
diff --git a/platform/srf06-cc26xx/contiki-main.c b/platform/srf06-cc26xx/contiki-main.c
index d28643531..f2f6bbe21 100644
--- a/platform/srf06-cc26xx/contiki-main.c
+++ b/platform/srf06-cc26xx/contiki-main.c
@@ -193,7 +193,7 @@ main(void)
   serial_line_init();
 
   printf("Starting " CONTIKI_VERSION_STRING "\n");
-  printf("With CC26xxware v%u.%02u.%02u.%u\n", DRIVERLIB_MAJOR_VER,
+  printf("With DriverLib v%u.%02u.%02u.%u\n", DRIVERLIB_MAJOR_VER,
          DRIVERLIB_MINOR_VER, DRIVERLIB_PATCH_VER, DRIVERLIB_BUILD_ID);
   printf(BOARD_STRING " using CC%u\n", CC26XX_MODEL_CPU_VARIANT);
 
diff --git a/platform/srf06-cc26xx/sensortag/Makefile.sensortag b/platform/srf06-cc26xx/sensortag/Makefile.sensortag
index 98fad7a68..688826417 100644
--- a/platform/srf06-cc26xx/sensortag/Makefile.sensortag
+++ b/platform/srf06-cc26xx/sensortag/Makefile.sensortag
@@ -1,4 +1,4 @@
-CFLAGS += -DBOARD_SENSORTAG=1 -DTI_BSP_BOARD_HDR=\"ti-bsp-st.h\"
+CFLAGS += -DBOARD_SENSORTAG=1
 CFLAGS += -DBACKDOOR_IOID=0x00000000
 
 BOARD_SOURCEFILES += leds-arch.c sensortag-sensors.c  sensor-common.c
diff --git a/platform/srf06-cc26xx/sensortag/button-sensor.c b/platform/srf06-cc26xx/sensortag/button-sensor.c
index 089ea7332..e6a9114ea 100644
--- a/platform/srf06-cc26xx/sensortag/button-sensor.c
+++ b/platform/srf06-cc26xx/sensortag/button-sensor.c
@@ -227,7 +227,7 @@ value_left(int type)
 {
   if(type == BUTTON_SENSOR_VALUE_STATE) {
     return ti_lib_gpio_pin_read(BOARD_KEY_LEFT) == 0 ?
-        BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
+           BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
   } else if(type == BUTTON_SENSOR_VALUE_DURATION) {
     return (int)left_timer.duration;
   }
@@ -239,7 +239,7 @@ value_right(int type)
 {
   if(type == BUTTON_SENSOR_VALUE_STATE) {
     return ti_lib_gpio_pin_read(BOARD_KEY_RIGHT) == 0 ?
-        BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
+           BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
   } else if(type == BUTTON_SENSOR_VALUE_DURATION) {
     return (int)right_timer.duration;
   }
diff --git a/platform/srf06-cc26xx/sensortag/reed-relay.c b/platform/srf06-cc26xx/sensortag/reed-relay.c
index b5956f6f8..612163b12 100644
--- a/platform/srf06-cc26xx/sensortag/reed-relay.c
+++ b/platform/srf06-cc26xx/sensortag/reed-relay.c
@@ -50,7 +50,7 @@
 /*---------------------------------------------------------------------------*/
 static struct timer debouncetimer;
 /*---------------------------------------------------------------------------*/
-#define REED_ISR_CFG            (IOC_CURRENT_2MA  | IOC_STRENGTH_AUTO |       \
+#define REED_IO_CFG             (IOC_CURRENT_2MA  | IOC_STRENGTH_AUTO |       \
                                  IOC_IOPULL_DOWN  | IOC_SLEW_DISABLE  |       \
                                  IOC_HYST_DISABLE | IOC_BOTH_EDGES    |       \
                                  IOC_INT_DISABLE  | IOC_IOMODE_NORMAL |       \
@@ -94,10 +94,12 @@ configure(int type, int value)
     ti_lib_ioc_int_disable(BOARD_IOID_REED_RELAY);
     ti_lib_gpio_event_clear(1 << BOARD_IOID_REED_RELAY);
 
-    /* Enabled the GPIO clock when the CM3 is running */
+    /* Enable the GPIO clock when the CM3 is running */
     ti_lib_prcm_peripheral_run_enable(PRCM_PERIPH_GPIO);
+
+    /* S/W control, input, pull-down */
     ti_lib_ioc_port_configure_set(BOARD_IOID_REED_RELAY, IOC_PORT_GPIO,
-                                  REED_ISR_CFG);
+                                  REED_IO_CFG);
 
     gpio_interrupt_register_handler(BOARD_IOID_REED_RELAY,
                                     reed_interrupt_handler);
diff --git a/platform/srf06-cc26xx/srf06/Makefile.srf06 b/platform/srf06-cc26xx/srf06/Makefile.srf06
index 7d64aac94..ee64aa519 100644
--- a/platform/srf06-cc26xx/srf06/Makefile.srf06
+++ b/platform/srf06-cc26xx/srf06/Makefile.srf06
@@ -1,5 +1,3 @@
 CFLAGS += -DBOARD_SMARTRF06EB=1
 
 BOARD_SOURCEFILES += leds-arch.c srf06-sensors.c button-sensor.c board.c
-
-CONTIKI_TARGET_DIRS += $(BOARD)/bsp
diff --git a/platform/srf06-cc26xx/srf06/button-sensor.c b/platform/srf06-cc26xx/srf06/button-sensor.c
index 5c6dae6f1..9638d511e 100644
--- a/platform/srf06-cc26xx/srf06/button-sensor.c
+++ b/platform/srf06-cc26xx/srf06/button-sensor.c
@@ -329,7 +329,7 @@ value_select(int type)
 {
   if(type == BUTTON_SENSOR_VALUE_STATE) {
     return ti_lib_gpio_pin_read(BOARD_KEY_SELECT) == 0 ?
-        BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
+           BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
   } else if(type == BUTTON_SENSOR_VALUE_DURATION) {
     return (int)sel_timer.duration;
   }
@@ -341,7 +341,7 @@ value_left(int type)
 {
   if(type == BUTTON_SENSOR_VALUE_STATE) {
     return ti_lib_gpio_pin_read(BOARD_KEY_LEFT) == 0 ?
-        BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
+           BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
   } else if(type == BUTTON_SENSOR_VALUE_DURATION) {
     return (int)left_timer.duration;
   }
@@ -353,7 +353,7 @@ value_right(int type)
 {
   if(type == BUTTON_SENSOR_VALUE_STATE) {
     return ti_lib_gpio_pin_read(BOARD_KEY_RIGHT) == 0 ?
-        BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
+           BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
   } else if(type == BUTTON_SENSOR_VALUE_DURATION) {
     return (int)right_timer.duration;
   }
@@ -365,7 +365,7 @@ value_up(int type)
 {
   if(type == BUTTON_SENSOR_VALUE_STATE) {
     return ti_lib_gpio_pin_read(BOARD_KEY_UP) == 0 ?
-        BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
+           BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
   } else if(type == BUTTON_SENSOR_VALUE_DURATION) {
     return (int)up_timer.duration;
   }
@@ -377,7 +377,7 @@ value_down(int type)
 {
   if(type == BUTTON_SENSOR_VALUE_STATE) {
     return ti_lib_gpio_pin_read(BOARD_KEY_DOWN) == 0 ?
-        BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
+           BUTTON_SENSOR_VALUE_PRESSED : BUTTON_SENSOR_VALUE_RELEASED;
   } else if(type == BUTTON_SENSOR_VALUE_DURATION) {
     return (int)down_timer.duration;
   }