diff --git a/arch/platform/cc2538dk/Makefile.cc2538dk b/arch/platform/cc2538dk/Makefile.cc2538dk
index c633782e9..e7be95c28 100644
--- a/arch/platform/cc2538dk/Makefile.cc2538dk
+++ b/arch/platform/cc2538dk/Makefile.cc2538dk
@@ -6,7 +6,7 @@ endif
 
 CONTIKI_TARGET_DIRS = . dev
 
-CONTIKI_TARGET_SOURCEFILES += leds.c leds-arch.c
+CONTIKI_TARGET_SOURCEFILES += leds-arch.c
 CONTIKI_TARGET_SOURCEFILES += platform.c
 CONTIKI_TARGET_SOURCEFILES += sensors.c smartrf-sensors.c
 CONTIKI_TARGET_SOURCEFILES += button-sensor.c als-sensor.c
diff --git a/arch/platform/cc2538dk/dev/board.h b/arch/platform/cc2538dk/dev/board.h
index 6e3021ceb..0b2a4cd09 100644
--- a/arch/platform/cc2538dk/dev/board.h
+++ b/arch/platform/cc2538dk/dev/board.h
@@ -71,20 +71,25 @@
  * @{
  */
 /*---------------------------------------------------------------------------*/
-#define LEDS_YELLOW             2 /**< LED2 (Yellow) -> PC1 */
-#define LEDS_GREEN              4 /**< LED3 (Green)  -> PC2 */
-#define LEDS_ORANGE             8 /**< LED4 (Orange) -> PC3 */
+#define LEDS_CONF_YELLOW           1
+#define LEDS_CONF_GREEN            2
+#define LEDS_CONF_ORANGE           4
+
+#define LEDS_ARCH_L1_PORT GPIO_C_NUM
+#define LEDS_ARCH_L1_PIN           1
+#define LEDS_ARCH_L2_PORT GPIO_C_NUM
+#define LEDS_ARCH_L2_PIN           2
+#define LEDS_ARCH_L3_PORT GPIO_C_NUM
+#define LEDS_ARCH_L3_PIN           3
 
 #if USB_SERIAL_CONF_ENABLE
-#define LEDS_CONF_ALL           14
-#define LEDS_RED                LEDS_ORANGE
+#define LEDS_CONF_COUNT            3
 #else
-#define LEDS_CONF_ALL           15
-#define LEDS_RED                1 /**< LED1 (Red)    -> PC0 */
+#define LEDS_ARCH_L4_PORT GPIO_C_NUM
+#define LEDS_ARCH_L4_PIN           0
+#define LEDS_CONF_RED              8
+#define LEDS_CONF_COUNT            4
 #endif
-
-/* Notify various examples that we have LEDs */
-#define PLATFORM_HAS_LEDS       1
 /** @} */
 /*---------------------------------------------------------------------------*/
 /** \name USB configuration
diff --git a/arch/platform/cc2538dk/dev/leds-arch.c b/arch/platform/cc2538dk/dev/leds-arch.c
index 661f46160..c849355b4 100644
--- a/arch/platform/cc2538dk/dev/leds-arch.c
+++ b/arch/platform/cc2538dk/dev/leds-arch.c
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2012, 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- *
  * 3. Neither the name of the copyright holder nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
@@ -28,45 +28,34 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/**
- * \addtogroup cc2538-smartrf
- * @{
- *
- * \defgroup cc2538dk-leds SmartRF06EB LED driver
- *
- * LED driver implementation for the TI SmartRF06EB + cc2538EM
- * @{
- *
- * \file
- * LED driver implementation for the TI SmartRF06EB + cc2538EM
- */
+/*---------------------------------------------------------------------------*/
 #include "contiki.h"
-#include "reg.h"
 #include "dev/leds.h"
-#include "dev/gpio.h"
+#include "dev/gpio-hal.h"
+#include "dev/gpio-hal-arch.h"
 
-#define LEDS_GPIO_PIN_MASK   LEDS_ALL
+#include <stdbool.h>
 /*---------------------------------------------------------------------------*/
-void
-leds_arch_init(void)
-{
-  GPIO_SET_OUTPUT(GPIO_C_BASE, LEDS_GPIO_PIN_MASK);
-}
-/*---------------------------------------------------------------------------*/
-unsigned char
-leds_arch_get(void)
-{
-  return GPIO_READ_PIN(GPIO_C_BASE, LEDS_GPIO_PIN_MASK);
-}
-/*---------------------------------------------------------------------------*/
-void
-leds_arch_set(unsigned char leds)
-{
-  GPIO_WRITE_PIN(GPIO_C_BASE, LEDS_GPIO_PIN_MASK, leds);
-}
+const leds_t leds_arch_leds[] = {
+  {
+    .pin = GPIO_PORT_PIN_TO_GPIO_HAL_PIN(LEDS_ARCH_L1_PORT, LEDS_ARCH_L1_PIN),
+    .negative_logic = false
+  },
+  {
+    .pin = GPIO_PORT_PIN_TO_GPIO_HAL_PIN(LEDS_ARCH_L2_PORT, LEDS_ARCH_L2_PIN),
+    .negative_logic = false
+  },
+  {
+    .pin = GPIO_PORT_PIN_TO_GPIO_HAL_PIN(LEDS_ARCH_L3_PORT, LEDS_ARCH_L3_PIN),
+    .negative_logic = false
+  },
+#if !USB_SERIAL_CONF_ENABLE
+  {
+    .pin = GPIO_PORT_PIN_TO_GPIO_HAL_PIN(LEDS_ARCH_L4_PORT, LEDS_ARCH_L4_PIN),
+    .negative_logic = false
+  },
+#endif
+};
 /*---------------------------------------------------------------------------*/
 
-/**
- * @}
- * @}
- */
+
diff --git a/arch/platform/cc2538dk/platform.c b/arch/platform/cc2538dk/platform.c
index 3897c6292..8add14292 100644
--- a/arch/platform/cc2538dk/platform.c
+++ b/arch/platform/cc2538dk/platform.c
@@ -74,7 +74,7 @@
 #define LOG_LEVEL LOG_LEVEL_MAIN
 /*---------------------------------------------------------------------------*/
 static void
-fade(unsigned char l)
+fade(leds_mask_t l)
 {
   volatile int i;
   int k, j;