From 29ae4cdd1cd8d9dd4cdaabc29b6dd682b590106d Mon Sep 17 00:00:00 2001
From: arturo182 <arturo182@tlen.pl>
Date: Wed, 7 Feb 2018 20:36:19 +0100
Subject: nrf: Fix building pca10056 without SD

---
 ports/nrf/Makefile                          | 3 ---
 ports/nrf/boards/feather52/mpconfigboard.mk | 5 +++++
 ports/nrf/boards/nrf52840_1M_256k.ld        | 4 ++--
 ports/nrf/boards/pca10056/mpconfigboard.mk  | 7 +++++++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 9049bdb64..37fb2dc80 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -19,9 +19,6 @@ ifeq ($(SD), )
 	include boards/$(BOARD)/mpconfigboard.mk
 	-include mpconfigport.mk
 
-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)
-
 else
 	# If the build directory is not given, make it reflect the board name.
 	BUILD ?= build-$(BOARD)-$(SD_LOWER)
diff --git a/ports/nrf/boards/feather52/mpconfigboard.mk b/ports/nrf/boards/feather52/mpconfigboard.mk
index 089189e9f..b6a4f795b 100644
--- a/ports/nrf/boards/feather52/mpconfigboard.mk
+++ b/ports/nrf/boards/feather52/mpconfigboard.mk
@@ -8,6 +8,11 @@ BOOTLOADER_PKG = boards/feather52/bootloader/feather52_bootloader_$(SOFTDEV_VERS
 
 NRF_DEFINES += -DNRF52832_XXAA
 
+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/nrf52840_1M_256k.ld b/ports/nrf/boards/nrf52840_1M_256k.ld
index 7652e2557..eb8a18aef 100644
--- a/ports/nrf/boards/nrf52840_1M_256k.ld
+++ b/ports/nrf/boards/nrf52840_1M_256k.ld
@@ -14,8 +14,8 @@ MEMORY
 
 /* produce a link error if there is not this amount of RAM for these sections */
 _minimum_stack_size = 40K;
-_minimum_heap_size = 128K;
- 
+_minimum_heap_size = 0;
+
 /* top end of the stack */
 
 /*_stack_end = ORIGIN(RAM) + LENGTH(RAM);*/
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.mk b/ports/nrf/boards/pca10056/mpconfigboard.mk
index 76661243a..49df644b2 100644
--- a/ports/nrf/boards/pca10056/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10056/mpconfigboard.mk
@@ -1,6 +1,13 @@
 MCU_SERIES = m4
 MCU_VARIANT = nrf52
 MCU_SUB_VARIANT = nrf52840
+SOFTDEV_VERSION ?= 6.0.0-6.alpha
+
 LD_FILE = boards/nrf52840_1M_256k.ld
 
 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
-- 
cgit v1.2.3