From ea75d9919f61303bccb52e6ea1ba7fb059a12f95 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 17 Nov 2016 00:33:37 +0100
Subject: [PATCH] Removing unused 'NRF_SOFTDEVICE' compile variable from all
 board .mk softdevice targets.

---
 nrf5/boards/pca10000/mpconfigboard_s110.mk | 1 -
 nrf5/boards/pca10028/mpconfigboard_s110.mk | 2 --
 nrf5/boards/pca10028/mpconfigboard_s120.mk | 1 -
 nrf5/boards/pca10028/mpconfigboard_s130.mk | 1 -
 nrf5/boards/pca10031/mpconfigboard_s110.mk | 1 -
 nrf5/boards/pca10031/mpconfigboard_s120.mk | 1 -
 nrf5/boards/pca10031/mpconfigboard_s130.mk | 1 -
 nrf5/boards/pca10040/mpconfigboard_s132.mk | 1 -
 nrf5/boards/pca10040/mpconfigboard_s1xx.mk | 1 -
 9 files changed, 10 deletions(-)

diff --git a/nrf5/boards/pca10000/mpconfigboard_s110.mk b/nrf5/boards/pca10000/mpconfigboard_s110.mk
index 32ba77b08e..b706522ccf 100644
--- a/nrf5/boards/pca10000/mpconfigboard_s110.mk
+++ b/nrf5/boards/pca10000/mpconfigboard_s110.mk
@@ -1,7 +1,6 @@
 MCU_SERIES = m0
 MCU_VARIANT = NRF51
 LD_FILE = boards/nrf51822_aa_s110.ld
-NRF_SOFTDEVICE = NRF_S110_SOFTDEVICE
 
 SRC_C += \
 	hal/hal_uart.c \
diff --git a/nrf5/boards/pca10028/mpconfigboard_s110.mk b/nrf5/boards/pca10028/mpconfigboard_s110.mk
index 57db65658b..c2bd3b42ef 100644
--- a/nrf5/boards/pca10028/mpconfigboard_s110.mk
+++ b/nrf5/boards/pca10028/mpconfigboard_s110.mk
@@ -1,8 +1,6 @@
 MCU_SERIES = m0
 MCU_VARIANT = NRF51
 LD_FILE = boards/nrf51822_ac_s110.ld
-NRF_SOFTDEVICE = NRF_S110_SOFTDEVICE
-
 
 SRC_C += \
 	hal/hal_uart.c \
diff --git a/nrf5/boards/pca10028/mpconfigboard_s120.mk b/nrf5/boards/pca10028/mpconfigboard_s120.mk
index 6113ee2ae7..629f8c6178 100644
--- a/nrf5/boards/pca10028/mpconfigboard_s120.mk
+++ b/nrf5/boards/pca10028/mpconfigboard_s120.mk
@@ -1,7 +1,6 @@
 MCU_SERIES = m0
 MCU_VARIANT = NRF51
 LD_FILE = boards/nrf51822_ac_s120.ld
-NRF_SOFTDEVICE = NRF_S120_SOFTDEVICE
 
 SRC_C += \
 	hal/hal_uart.c \
diff --git a/nrf5/boards/pca10028/mpconfigboard_s130.mk b/nrf5/boards/pca10028/mpconfigboard_s130.mk
index ae41658107..d4bc2e48c8 100644
--- a/nrf5/boards/pca10028/mpconfigboard_s130.mk
+++ b/nrf5/boards/pca10028/mpconfigboard_s130.mk
@@ -1,7 +1,6 @@
 MCU_SERIES = m0
 MCU_VARIANT = NRF51
 LD_FILE = boards/nrf51822_ac_s130.ld
-NRF_SOFTDEVICE = NRF_S130_SOFTDEVICE
 
 SRC_C += \
 	hal/hal_uart.c \
diff --git a/nrf5/boards/pca10031/mpconfigboard_s110.mk b/nrf5/boards/pca10031/mpconfigboard_s110.mk
index 0dc8a25900..c2bd3b42ef 100644
--- a/nrf5/boards/pca10031/mpconfigboard_s110.mk
+++ b/nrf5/boards/pca10031/mpconfigboard_s110.mk
@@ -1,7 +1,6 @@
 MCU_SERIES = m0
 MCU_VARIANT = NRF51
 LD_FILE = boards/nrf51822_ac_s110.ld
-NRF_SOFTDEVICE = NRF_S110_SOFTDEVICE
 
 SRC_C += \
 	hal/hal_uart.c \
diff --git a/nrf5/boards/pca10031/mpconfigboard_s120.mk b/nrf5/boards/pca10031/mpconfigboard_s120.mk
index 6113ee2ae7..629f8c6178 100644
--- a/nrf5/boards/pca10031/mpconfigboard_s120.mk
+++ b/nrf5/boards/pca10031/mpconfigboard_s120.mk
@@ -1,7 +1,6 @@
 MCU_SERIES = m0
 MCU_VARIANT = NRF51
 LD_FILE = boards/nrf51822_ac_s120.ld
-NRF_SOFTDEVICE = NRF_S120_SOFTDEVICE
 
 SRC_C += \
 	hal/hal_uart.c \
diff --git a/nrf5/boards/pca10031/mpconfigboard_s130.mk b/nrf5/boards/pca10031/mpconfigboard_s130.mk
index ae41658107..d4bc2e48c8 100644
--- a/nrf5/boards/pca10031/mpconfigboard_s130.mk
+++ b/nrf5/boards/pca10031/mpconfigboard_s130.mk
@@ -1,7 +1,6 @@
 MCU_SERIES = m0
 MCU_VARIANT = NRF51
 LD_FILE = boards/nrf51822_ac_s130.ld
-NRF_SOFTDEVICE = NRF_S130_SOFTDEVICE
 
 SRC_C += \
 	hal/hal_uart.c \
diff --git a/nrf5/boards/pca10040/mpconfigboard_s132.mk b/nrf5/boards/pca10040/mpconfigboard_s132.mk
index 1ba1848f61..28f6549a28 100644
--- a/nrf5/boards/pca10040/mpconfigboard_s132.mk
+++ b/nrf5/boards/pca10040/mpconfigboard_s132.mk
@@ -1,7 +1,6 @@
 MCU_SERIES = m4
 MCU_VARIANT = NRF52
 LD_FILE = boards/nrf52832_aa_s132.ld
-NRF_SOFTDEVICE = NRF_S132_SOFTDEVICE
 
 SRC_C += \
 	hal/hal_uarte.c \
diff --git a/nrf5/boards/pca10040/mpconfigboard_s1xx.mk b/nrf5/boards/pca10040/mpconfigboard_s1xx.mk
index 9b67142f78..73f9dc9018 100644
--- a/nrf5/boards/pca10040/mpconfigboard_s1xx.mk
+++ b/nrf5/boards/pca10040/mpconfigboard_s1xx.mk
@@ -1,7 +1,6 @@
 MCU_SERIES = m4
 MCU_VARIANT = NRF52
 LD_FILE = boards/nrf52832_aa_s1xx.ld
-NRF_SOFTDEVICE = NRF_S1XX_SOFTDEVICE
 
 SRC_C += \
 	hal/hal_uarte.c \