djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix other builds missing new heap bounds functions

Browse Source
This commit is contained in:
Scott Shawcroft 2020-01-18 18:06:56 -08:00
parent 834259a2cf
commit 1c39606345
No known key found for this signature in database
GPG Key ID: 9349BC7E64B1921E
6 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/atmel-samd/supervisor/port.c
View File

@ -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);

8
ports/cxd56/supervisor/port.c
View File

@ -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.

6
ports/mimxrt10xx/boards/imxrt1010_evk/flash_config.c
View File

@ -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

6
ports/mimxrt10xx/boards/imxrt1060_evk/flash_config.c
View File

@ -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

8
ports/nrf/supervisor/port.c
View File

@ -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;
}

10
ports/stm32f4/supervisor/port.c
View File

@ -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;
}