Skip to content

Commit 170ba1c

Browse files
niklarmmeriac
authored andcommitted
Move page heap after uVisor private data.
1 parent a7c7ced commit 170ba1c

File tree

1 file changed

+11
-16
lines changed
  • hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_GCC_ARM

1 file changed

+11
-16
lines changed

hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_GCC_ARM/MK64FN1M0xxx12.ld

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,16 @@ SECTIONS
227227
__uvisor_bss_end = .;
228228
} > m_data
229229

230+
/* Heap space for the page allocator */
231+
.page_heap (NOLOAD) :
232+
{
233+
. = ALIGN(32);
234+
__uvisor_page_start = .;
235+
KEEP(*(.keep.uvisor.page_heap))
236+
. = ALIGN(32);
237+
__uvisor_page_end = .;
238+
} > m_data_2
239+
230240
__VECTOR_RAM = DEFINED(__ram_vector_table__) ? __VECTOR_RAM__ : ORIGIN(m_interrupts);
231241
__RAM_VECTOR_TABLE_SIZE_BYTES = DEFINED(__ram_vector_table__) ? (__interrupts_ram_end__ - __interrupts_ram_start__) : 0x0;
232242

@@ -325,21 +335,6 @@ SECTIONS
325335
__uvisor_heap_end = .;
326336
} > m_data_2
327337

328-
.stack :
329-
{
330-
. = ALIGN(8);
331-
. += STACK_SIZE;
332-
__StackTop = .;
333-
} > m_data_2
334-
335-
/* Heap space for the page allocator */
336-
.page_heap (NOLOAD) :
337-
{
338-
__uvisor_page_start = .;
339-
. = ORIGIN(m_data_2) + LENGTH(m_data_2) - 4;
340-
__uvisor_page_end = .;
341-
} > m_data_2
342-
343338
m_usb_bdt USB_RAM_START (NOLOAD) :
344339
{
345340
*(m_usb_bdt)
@@ -352,6 +347,7 @@ SECTIONS
352347
}
353348

354349
/* Initializes stack on the end of block */
350+
__StackTop = ORIGIN(m_data_2) + LENGTH(m_data_2);
355351
__StackLimit = __StackTop - STACK_SIZE;
356352
PROVIDE(__stack = __StackTop);
357353

@@ -365,4 +361,3 @@ SECTIONS
365361
__uvisor_sram_start = ORIGIN(m_data);
366362
__uvisor_sram_end = ORIGIN(m_data_2) + LENGTH(m_data_2);
367363
}
368-

0 commit comments

Comments
 (0)