nrf: Simplify the board makefiles

With the only difference between a SD and non-SD build is the linker
file, there's no need to have two separate .mk per board files,
just use a conditional.

9 files changed, 55 insertions, 89 deletions

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 89d9fe5bd..abc0e3365 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -12,19 +12,14 @@ SD_LOWER = $(shell echo $(SD) | tr '[:upper:]' '[:lower:]')
 
 # TODO: Verify that it is a valid target.
 
-ifeq ($(SD), )
-	# If the build directory is not given, make it reflect the board name.
-	BUILD ?= build-$(BOARD)
-	include ../../py/mkenv.mk
-	include boards/$(BOARD)/mpconfigboard.mk
-	-include mpconfigport.mk
-else
-	# If the build directory is not given, make it reflect the board name.
-	BUILD ?= build-$(BOARD)-$(SD_LOWER)
-	include ../../py/mkenv.mk
-	include boards/$(BOARD)/mpconfigboard_$(SD_LOWER).mk
-	-include mpconfigport.mk
+# If the build directory is not given, make it reflect the board name
+BUILD ?= $(if $(SD),build-$(BOARD)-$(SD_LOWER),build-$(BOARD))
+
+include ../../py/mkenv.mk
+include boards/$(BOARD)/mpconfigboard.mk
+-include mpconfigport.mk
 
+ifneq ($(SD), )
 	include drivers/bluetooth/bluetooth_common.mk
 endif
 
diff --git a/ports/nrf/boards/feather52832/mpconfigboard.mk b/ports/nrf/boards/feather52832/mpconfigboard.mk
index 4e65b8428..cf89fad78 100644
--- a/ports/nrf/boards/feather52832/mpconfigboard.mk
+++ b/ports/nrf/boards/feather52832/mpconfigboard.mk
@@ -14,11 +14,6 @@ else
    NRFUTIL = nrfutil
 endif
 
-ifeq ($(SD), )
-INC += -Idrivers/bluetooth/s132_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/s132_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include
-INC += -Idrivers/bluetooth/s132_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/s132_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include/$(MCU_VARIANT)
-endif
-
 CFLAGS += -DADAFRUIT_FEATHER52
 
 check_defined = \
diff --git a/ports/nrf/boards/feather52832/mpconfigboard_s132.mk b/ports/nrf/boards/feather52832/mpconfigboard_s132.mk
deleted file mode 100644
index 315758de3..000000000
--- a/ports/nrf/boards/feather52832/mpconfigboard_s132.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is a placeholder to enable building with 'SD=s132' flag
-# The actual config data is stored in the file referenced below, regardless
-# of whether S132 is actively used or not.
-include boards/$(BOARD)/mpconfigboard.mk
diff --git a/ports/nrf/boards/feather52840/mpconfigboard.mk b/ports/nrf/boards/feather52840/mpconfigboard.mk
index a961ee22c..a4bd52e96 100644
--- a/ports/nrf/boards/feather52840/mpconfigboard.mk
+++ b/ports/nrf/boards/feather52840/mpconfigboard.mk
@@ -1,4 +1,36 @@
-# This file is a placeholder to enable building with 'SD=s140' flag
-# The actual config data is stored in the file referenced below, regardless
-# of whether S140 is actively used or not.
-include boards/$(BOARD)/mpconfigboard.mk
+MCU_SERIES = m4
+MCU_VARIANT = nrf52
+MCU_SUB_VARIANT = nrf52840
+SOFTDEV_VERSION ?= 6.0.0
+
+LD_FILE = boards/feather52840/bluefruit_nrf52840_s140_6.0.0.ld
+BOOTLOADER_FILENAME = boards/feather52840/bootloader/feather52840_bootloader_6.0.0_s140_single
+
+NRF_DEFINES += -DNRF52840_XXAA
+
+ifeq ($(OS),Windows_NT)
+   NRFUTIL = ../../lib/nrfutil/binaries/win32/nrfutil.exe
+else
+   NRFUTIL = nrfutil
+endif
+
+CFLAGS += -DADAFRUIT_FEATHER52840
+
+check_defined = \
+    $(strip $(foreach 1,$1, \
+    $(call __check_defined,$1,$(strip $(value 2)))))
+__check_defined = \
+    $(if $(value $1),, \
+    $(error Undefined make flag: $1$(if $2, ($2))))
+
+.PHONY: dfu-gen dfu-flash boot-flash
+
+dfu-gen:
+	$(NRFUTIL) dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $(BUILD)/$(OUTPUT_FILENAME).hex $(BUILD)/dfu-package.zip
+
+dfu-flash:
+	@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0)
+	$(NRFUTIL) --verbose dfu serial --package $(BUILD)/dfu-package.zip -p $(SERIAL) -b 115200
+
+boot-flash:
+	nrfjprog --program $(BOOTLOADER_FILENAME).hex -f nrf52 --chiperase --reset
diff --git a/ports/nrf/boards/feather52840/mpconfigboard_s140.mk b/ports/nrf/boards/feather52840/mpconfigboard_s140.mk
deleted file mode 100644
index cf2b7e140..000000000
--- a/ports/nrf/boards/feather52840/mpconfigboard_s140.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-MCU_SERIES = m4
-MCU_VARIANT = nrf52
-MCU_SUB_VARIANT = nrf52840
-SOFTDEV_VERSION ?= 6.0.0
-
-LD_FILE = boards/feather52840/bluefruit_nrf52840_s140_6.0.0.ld
-BOOTLOADER_FILENAME = boards/feather52840/bootloader/feather52840_bootloader_6.0.0_s140_single
-
-NRF_DEFINES += -DNRF52840_XXAA
-
-ifeq ($(OS),Windows_NT)
-   NRFUTIL = ../../lib/nrfutil/binaries/win32/nrfutil.exe
-else
-   NRFUTIL = nrfutil
-endif
-
-CFLAGS += -DADAFRUIT_FEATHER52840
-
-ifeq ($(SD), )
-INC += -Idrivers/bluetooth/s140_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/s140_$(MCU_SUB_VARIANT)_$(SOFTDEV_VERSION)_API/include
-INC += -Idrivers/bluetooth/s140_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/s140_$(MCU_SUB_VARIANT)_$(SOFTDEV_VERSION)_API/include/$(MCU_VARIANT)
-endif
-
-check_defined = \
-    $(strip $(foreach 1,$1, \
-    $(call __check_defined,$1,$(strip $(value 2)))))
-__check_defined = \
-    $(if $(value $1),, \
-    $(error Undefined make flag: $1$(if $2, ($2))))
-
-.PHONY: dfu-gen dfu-flash boot-flash
-
-dfu-gen:
-	$(NRFUTIL) dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $(BUILD)/$(OUTPUT_FILENAME).hex $(BUILD)/dfu-package.zip
-
-dfu-flash:
-	@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0)
-	$(NRFUTIL) --verbose dfu serial --package $(BUILD)/dfu-package.zip -p $(SERIAL) -b 115200
-
-boot-flash:
-	nrfjprog --program $(BOOTLOADER_FILENAME).hex -f nrf52 --chiperase --reset
diff --git a/ports/nrf/boards/pca10040/mpconfigboard.mk b/ports/nrf/boards/pca10040/mpconfigboard.mk
index 79a45890e..036969299 100644
--- a/ports/nrf/boards/pca10040/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10040/mpconfigboard.mk
@@ -1,6 +1,12 @@
 MCU_SERIES = m4
 MCU_VARIANT = nrf52
 MCU_SUB_VARIANT = nrf52
-LD_FILE = boards/nrf52832_512k_64k.ld
+SOFTDEV_VERSION ?= 5.0.0
+
+ifeq ($(SD),)
+    LD_FILE = boards/nrf52832_512k_64k.ld
+else
+    LD_FILE = boards/nrf52832_512k_64k_s132_$(SOFTDEV_VERSION).ld
+endif
 
 NRF_DEFINES += -DNRF52832_XXAA
diff --git a/ports/nrf/boards/pca10040/mpconfigboard_s132.mk b/ports/nrf/boards/pca10040/mpconfigboard_s132.mk
deleted file mode 100644
index 382e51105..000000000
--- a/ports/nrf/boards/pca10040/mpconfigboard_s132.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-MCU_SERIES = m4
-MCU_VARIANT = nrf52
-MCU_SUB_VARIANT = nrf52
-SOFTDEV_VERSION = 5.0.0
-
-LD_FILE = boards/nrf52832_512k_64k_s132_$(SOFTDEV_VERSION).ld
-
-NRF_DEFINES += -DNRF52832_XXAA
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.mk b/ports/nrf/boards/pca10056/mpconfigboard.mk
index 857805727..931b351a2 100644
--- a/ports/nrf/boards/pca10056/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10056/mpconfigboard.mk
@@ -3,11 +3,10 @@ MCU_VARIANT = nrf52
 MCU_SUB_VARIANT = nrf52840
 SOFTDEV_VERSION ?= 6.0.0
 
-LD_FILE = boards/nrf52840_1M_256k.ld
+ifeq ($(SD),)
+    LD_FILE = boards/nrf52840_1M_256k.ld
+else
+    LD_FILE = boards/nrf52840_1M_256k_s140_$(SOFTDEV_VERSION).ld
+endif
 
 NRF_DEFINES += -DNRF52840_XXAA
-
-ifeq ($(SD), )
-INC += -Idrivers/bluetooth/s140_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/s140_$(MCU_SUB_VARIANT)_$(SOFTDEV_VERSION)_API/include
-INC += -Idrivers/bluetooth/s140_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/s140_$(MCU_SUB_VARIANT)_$(SOFTDEV_VERSION)_API/include/$(MCU_VARIANT)
-endif
diff --git a/ports/nrf/boards/pca10056/mpconfigboard_s140.mk b/ports/nrf/boards/pca10056/mpconfigboard_s140.mk
deleted file mode 100644
index a9d0c0ae8..000000000
--- a/ports/nrf/boards/pca10056/mpconfigboard_s140.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-MCU_SERIES = m4
-MCU_VARIANT = nrf52
-MCU_SUB_VARIANT = nrf52840
-SOFTDEV_VERSION ?= 6.0.0
-
-LD_FILE = boards/nrf52840_1M_256k_s140_$(SOFTDEV_VERSION).ld
-
-NRF_DEFINES += -DNRF52840_XXAA