diff --git a/arch/platform/srf06-cc26xx/sensortag/cc1350/Makefile.cc1350 b/arch/platform/srf06-cc26xx/sensortag/cc1350/Makefile.cc1350
index 3cacec197..cdae4c2b1 100644
--- a/arch/platform/srf06-cc26xx/sensortag/cc1350/Makefile.cc1350
+++ b/arch/platform/srf06-cc26xx/sensortag/cc1350/Makefile.cc1350
@@ -1,6 +1,3 @@
-### Add to the source list
-BOARD_SOURCEFILES += leds-arch.c
-
 ### Will allow the inclusion of the correct CPU makefile
 CPU_FAMILY = cc13xx
 
diff --git a/arch/platform/srf06-cc26xx/sensortag/cc1350/board.h b/arch/platform/srf06-cc26xx/sensortag/cc1350/board.h
index dbd64e538..d9269c8ff 100644
--- a/arch/platform/srf06-cc26xx/sensortag/cc1350/board.h
+++ b/arch/platform/srf06-cc26xx/sensortag/cc1350/board.h
@@ -58,20 +58,13 @@
 #include "ioc.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name LED configurations
+ * \name LED HAL configuration
  *
  * Those values are not meant to be modified by the user
  * @{
  */
-#define LEDS_RED       1
-#define LEDS_GREEN     LEDS_RED
-#define LEDS_YELLOW    LEDS_RED
-#define LEDS_ORANGE    LEDS_RED
-
-#define LEDS_CONF_ALL  1
-
-/* Notify various examples that we have LEDs */
-#define PLATFORM_HAS_LEDS        1
+#define LEDS_CONF_COUNT                 1
+#define LEDS_CONF_RED                   1
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
@@ -81,8 +74,6 @@
  * @{
  */
 #define BOARD_IOID_LED_1          IOID_10
-#define BOARD_LED_1               (1 << BOARD_IOID_LED_1)
-#define BOARD_LED_ALL             BOARD_LED_1
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/arch/platform/srf06-cc26xx/sensortag/cc1350/leds-arch.c b/arch/platform/srf06-cc26xx/sensortag/cc1350/leds-arch.c
index f4214628e..21b8cf968 100644
--- a/arch/platform/srf06-cc26xx/sensortag/cc1350/leds-arch.c
+++ b/arch/platform/srf06-cc26xx/sensortag/cc1350/leds-arch.c
@@ -1,10 +1,11 @@
 /*
- * Copyright (c) 2014, Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright (c) 2018, George Oikonomou - http://www.spd.gr
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ -28,50 +29,15 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*---------------------------------------------------------------------------*/
-/**
- * \addtogroup sensortag-cc13xx-peripherals
- * @{
- *
- * \file
- *  Driver for the Sensortag-CC1350 LEDs
- */
-/*---------------------------------------------------------------------------*/
 #include "contiki.h"
 #include "dev/leds.h"
+#include "dev/gpio-hal.h"
 
-#include "ti-lib.h"
+#include <stdbool.h>
 /*---------------------------------------------------------------------------*/
-static unsigned char c;
-static int inited = 0;
+const leds_t leds_arch_leds[] = {
+  { .pin = BOARD_IOID_LED_1, .negative_logic = false },
+};
 /*---------------------------------------------------------------------------*/
-void
-leds_arch_init(void)
-{
-  if(inited) {
-    return;
-  }
-  inited = 1;
 
-  ti_lib_rom_ioc_pin_type_gpio_output(BOARD_IOID_LED_1);
 
-  ti_lib_gpio_clear_multi_dio(BOARD_LED_ALL);
-}
-/*---------------------------------------------------------------------------*/
-unsigned char
-leds_arch_get(void)
-{
-  return c;
-}
-/*---------------------------------------------------------------------------*/
-void
-leds_arch_set(unsigned char leds)
-{
-  c = leds;
-  ti_lib_gpio_clear_dio(BOARD_IOID_LED_1);
-
-  if((leds & LEDS_RED) == LEDS_RED) {
-    ti_lib_gpio_set_dio(BOARD_IOID_LED_1);
-  }
-}
-/*---------------------------------------------------------------------------*/
-/** @} */
diff --git a/arch/platform/srf06-cc26xx/sensortag/cc2650/Makefile.cc2650 b/arch/platform/srf06-cc26xx/sensortag/cc2650/Makefile.cc2650
index 5b7cdadd9..e91cabda4 100644
--- a/arch/platform/srf06-cc26xx/sensortag/cc2650/Makefile.cc2650
+++ b/arch/platform/srf06-cc26xx/sensortag/cc2650/Makefile.cc2650
@@ -1,6 +1,3 @@
-### Add to the source list
-BOARD_SOURCEFILES += leds-arch.c
-
 ### Will allow the inclusion of the correct CPU makefile
 CPU_FAMILY = cc26xx
 
diff --git a/arch/platform/srf06-cc26xx/sensortag/cc2650/board.h b/arch/platform/srf06-cc26xx/sensortag/cc2650/board.h
index 977712ef2..2794e633e 100644
--- a/arch/platform/srf06-cc26xx/sensortag/cc2650/board.h
+++ b/arch/platform/srf06-cc26xx/sensortag/cc2650/board.h
@@ -58,20 +58,14 @@
 #include "ioc.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name LED configurations
+ * \name LED HAL configuration
  *
  * Those values are not meant to be modified by the user
  * @{
  */
-#define LEDS_RED       1
-#define LEDS_GREEN     2
-#define LEDS_YELLOW    LEDS_GREEN
-#define LEDS_ORANGE    LEDS_RED
-
-#define LEDS_CONF_ALL  3
-
-/* Notify various examples that we have LEDs */
-#define PLATFORM_HAS_LEDS        1
+#define LEDS_CONF_COUNT                 2
+#define LEDS_CONF_RED                   1
+#define LEDS_CONF_GREEN                 2
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
@@ -82,9 +76,6 @@
  */
 #define BOARD_IOID_LED_1          IOID_10
 #define BOARD_IOID_LED_2          IOID_15
-#define BOARD_LED_1               (1 << BOARD_IOID_LED_1)
-#define BOARD_LED_2               (1 << BOARD_IOID_LED_2)
-#define BOARD_LED_ALL             (BOARD_LED_1 | BOARD_LED_2)
 /** @} */
 /*---------------------------------------------------------------------------*/
 /**
diff --git a/arch/platform/srf06-cc26xx/sensortag/cc2650/leds-arch.c b/arch/platform/srf06-cc26xx/sensortag/cc2650/leds-arch.c
index c36959063..cab4888b7 100644
--- a/arch/platform/srf06-cc26xx/sensortag/cc2650/leds-arch.c
+++ b/arch/platform/srf06-cc26xx/sensortag/cc2650/leds-arch.c
@@ -1,10 +1,11 @@
 /*
- * Copyright (c) 2014, Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright (c) 2018, George Oikonomou - http://www.spd.gr
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ -28,54 +29,16 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*---------------------------------------------------------------------------*/
-/**
- * \addtogroup sensortag-cc26xx-peripherals
- * @{
- *
- * \file
- *  Driver for the Sensortag-CC26XX LEDs
- */
-/*---------------------------------------------------------------------------*/
 #include "contiki.h"
 #include "dev/leds.h"
+#include "dev/gpio-hal.h"
 
-#include "ti-lib.h"
+#include <stdbool.h>
 /*---------------------------------------------------------------------------*/
-static unsigned char c;
-static int inited = 0;
+const leds_t leds_arch_leds[] = {
+  { .pin = BOARD_IOID_LED_1, .negative_logic = false },
+  { .pin = BOARD_IOID_LED_2, .negative_logic = false },
+};
 /*---------------------------------------------------------------------------*/
-void
-leds_arch_init(void)
-{
-  if(inited) {
-    return;
-  }
-  inited = 1;
 
-  ti_lib_rom_ioc_pin_type_gpio_output(BOARD_IOID_LED_1);
-  ti_lib_rom_ioc_pin_type_gpio_output(BOARD_IOID_LED_2);
 
-  ti_lib_gpio_clear_multi_dio(BOARD_LED_ALL);
-}
-/*---------------------------------------------------------------------------*/
-unsigned char
-leds_arch_get(void)
-{
-  return c;
-}
-/*---------------------------------------------------------------------------*/
-void
-leds_arch_set(unsigned char leds)
-{
-  c = leds;
-  ti_lib_gpio_clear_multi_dio(BOARD_LED_ALL);
-
-  if((leds & LEDS_RED) == LEDS_RED) {
-    ti_lib_gpio_set_dio(BOARD_IOID_LED_1);
-  }
-  if((leds & LEDS_YELLOW) == LEDS_YELLOW) {
-    ti_lib_gpio_set_dio(BOARD_IOID_LED_2);
-  }
-}
-/*---------------------------------------------------------------------------*/
-/** @} */