6 files changed, 33 insertions, 13 deletions
diff --git a/ports/atmel-samd/supervisor/port.c b/ports/atmel-samd/supervisor/port.c
index 5662b159b..0a4cc8c19 100644
--- a/ports/atmel-samd/supervisor/port.c
+++ b/ports/atmel-samd/supervisor/port.c
@@ -331,6 +331,14 @@ uint32_t *port_stack_get_top(void) {
     return &_estack;
 }
 
+uint32_t *port_heap_get_bottom(void) {
+    return port_stack_get_limit();
+}
+
+uint32_t *port_heap_get_top(void) {
+    return port_stack_get_top();
+}
+
 // Place the word to save 8k from the end of RAM so we and the bootloader don't clobber it.
 #ifdef SAMD21
 uint32_t* safe_word = (uint32_t*) (HMCRAMC0_ADDR + HMCRAMC0_SIZE - 0x2000);
diff --git a/ports/cxd56/supervisor/port.c b/ports/cxd56/supervisor/port.c
index f06133468..5d2957f35 100644
--- a/ports/cxd56/supervisor/port.c
+++ b/ports/cxd56/supervisor/port.c
@@ -85,6 +85,14 @@ uint32_t *port_stack_get_top(void) {
     return rtcb->adj_stack_ptr;
 }
 
+uint32_t *port_heap_get_bottom(void) {
+    return port_stack_get_limit();
+}
+
+uint32_t *port_heap_get_top(void) {
+    return port_stack_get_top();
+}
+
 extern uint32_t _ebss;
 
 // Place the word to save just after our BSS section that gets blanked.
diff --git a/ports/mimxrt10xx/boards/imxrt1010_evk/flash_config.c b/ports/mimxrt10xx/boards/imxrt1010_evk/flash_config.c
index 805e62f01..7e8fb75b2 100644
--- a/ports/mimxrt10xx/boards/imxrt1010_evk/flash_config.c
+++ b/ports/mimxrt10xx/boards/imxrt1010_evk/flash_config.c
@@ -8,11 +8,6 @@
 #include "fsl_flexspi_nor_boot.h"
 #include "fsl_flexspi_nor_config.h"
 
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_device"
-#endif
-
 __attribute__((section(".boot_hdr.ivt")))
 /*************************************
  *  IVT Data
@@ -38,7 +33,6 @@ const BOOT_DATA_T boot_data = {
   PLUGIN_FLAG,                /* Plugin flag*/
   0xFFFFFFFF                  /* empty - extra data word */
 };
-#endif
 
 __attribute__((section(".boot_hdr.conf")))
 // Values copied from https://github.com/PaulStoffregen/cores/blob/ddb23fa5d97dac763bc06e11b9b41f026bd51f0a/teensy4/bootdata.c#L39
diff --git a/ports/mimxrt10xx/boards/imxrt1060_evk/flash_config.c b/ports/mimxrt10xx/boards/imxrt1060_evk/flash_config.c
index c51c59a51..7e046d494 100644
--- a/ports/mimxrt10xx/boards/imxrt1060_evk/flash_config.c
+++ b/ports/mimxrt10xx/boards/imxrt1060_evk/flash_config.c
@@ -8,11 +8,6 @@
 #include "fsl_flexspi_nor_boot.h"
 #include "fsl_flexspi_nor_config.h"
 
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_device"
-#endif
-
 __attribute__((section(".boot_hdr.ivt")))
 
 /*************************************
@@ -39,7 +34,6 @@ const BOOT_DATA_T boot_data = {
   PLUGIN_FLAG,                /* Plugin flag*/
   0xFFFFFFFF                  /* empty - extra data word */
 };
-#endif
 
 __attribute__((section(".boot_hdr.conf")))
 // Values copied from https://github.com/PaulStoffregen/cores/blob/ddb23fa5d97dac763bc06e11b9b41f026bd51f0a/teensy4/bootdata.c#L39
diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/supervisor/port.c
index af858aa4a..84bf9cbb6 100644
--- a/ports/nrf/supervisor/port.c
+++ b/ports/nrf/supervisor/port.c
@@ -146,6 +146,14 @@ void reset_cpu(void) {
     NVIC_SystemReset();
 }
 
+uint32_t *port_heap_get_bottom(void) {
+    return port_stack_get_limit();
+}
+
+uint32_t *port_heap_get_top(void) {
+    return port_stack_get_top();
+}
+
 uint32_t *port_stack_get_limit(void) {
     return &_ebss;
 }
diff --git a/ports/stm32f4/supervisor/port.c b/ports/stm32f4/supervisor/port.c
index df5a70cd1..6df261b35 100644
--- a/ports/stm32f4/supervisor/port.c
+++ b/ports/stm32f4/supervisor/port.c
@@ -50,7 +50,7 @@ safe_mode_t port_init(void) {
     stm32f4_peripherals_gpio_init();
 
     tick_init();
-    board_init(); 
+    board_init();
 
     return NO_SAFE_MODE;
 }
@@ -71,6 +71,14 @@ void reset_cpu(void) {
     NVIC_SystemReset();
 }
 
+uint32_t *port_heap_get_bottom(void) {
+    return port_stack_get_limit();
+}
+
+uint32_t *port_heap_get_top(void) {
+    return port_stack_get_top();
+}
+
 uint32_t *port_stack_get_limit(void) {
     return &_ebss;
 }