nRF51: Remove heap placeholder on nRF51 as not needed since no malloc…

…. Increase nRF51 var count (fix #985)
espruino · Dec 15, 2016 · 277b285 · 277b285
1 parent f3bd793
commit 277b285
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -10,6 +10,7 @@
             nRF5x: Add multi-channel hardware PWM (fix #991, fix #972)
             'dump()' now outputs code written with E.setBootCode as well (fix #999)
             nRF5x: Remember advertising information even after softdevice reboot  (fix #997)
+            nRF51: Remove heap placeholder on nRF51 as not needed since no malloc. Increase nRF51 var count (fix #985)
 
      1v89 : Allow entering of multi-line Templated Literals on the command-line (fix #970)
             Make lexer fail when parsing non-templated strings with newlines in 

diff --git a/Makefile b/Makefile
@@ -1300,7 +1300,7 @@ ifeq ($(FAMILY), NRF51)
   PRECOMPILED_OBJS += $(NRF5X_SDK_PATH)/components/toolchain/gcc/gcc_startup_nrf51.o
 
   DEFINES += -DNRF51 -DSWI_DISABLE0 -DSOFTDEVICE_PRESENT -DS130 -DBLE_STACK_SUPPORT_REQD # SoftDevice included by default.
-	DEFINES += -DNRF_SD_BLE_API_VERSION=2
+  DEFINES += -DNRF_SD_BLE_API_VERSION=2  
   LINKER_RAM:=$(shell python scripts/get_board_info.py $(BOARD) "board.chip['ram']")
 
   SOFTDEVICE        = $(NRF5X_SDK_PATH)/components/softdevice/s130/hex/s130_nrf51_2.0.1_softdevice.hex

diff --git a/boards/MICROBIT.py b/boards/MICROBIT.py
@@ -23,7 +23,7 @@
  'default_console_tx' : "H0", # pin 24
  'default_console_rx' : "H1", # pin 25
  'default_console_baudrate' : "9600",
- 'variables' : 100,
+ 'variables' : 350,
  'binary_name' : 'espruino_%v_microbit.hex',
  'build' : {
   'defines' : [

diff --git a/boards/NRF51TAG.py b/boards/NRF51TAG.py
@@ -22,7 +22,7 @@
 # 'default_console_tx' : "D15",
 # 'default_console_rx' : "D17",
 # 'default_console_baudrate' : "9600",
- 'variables' : 150,
+ 'variables' : 350,
  'binary_name' : 'espruino_%v_nrf51tag.bin',
  'build' : {
   'defines' : [

diff --git a/targetlibs/nrf5x/components/toolchain/gcc/gcc_startup_nrf51.S b/targetlibs/nrf5x/components/toolchain/gcc/gcc_startup_nrf51.S
@@ -56,7 +56,7 @@ __StackTop:
 #elif defined(__HEAP_SIZE)
     .equ Heap_Size, __HEAP_SIZE
 #else
-    .equ    Heap_Size, 2048
+    .equ    Heap_Size, 0
 #endif
     .globl __HeapBase
     .globl __HeapLimit