Skip to content

Commit f17abe6

Browse files
lgirdwoodlgirdwood
authored
Merge pull request #370 from mmaka1/link
build: linker: x scripts for cavs platforms aligned
2 parents 96edbbb + 15fdbd9 commit f17abe6

3 files changed

Lines changed: 127 additions & 7 deletions

File tree

‎src/platform/apollolake/apollolake.x.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ SECTIONS
235235
_wnd3_end = ABSOLUTE(.);
236236
} >wnd3 :wnd3_phdr
237237

238-
.WindowVectors.text : ALIGN(4)
238+
.WindowVectors.text : ALIGN(4)
239239
{
240240
_WindowVectors_text_start = ABSOLUTE(.);
241241
KEEP (*(.WindowVectors.text))
@@ -557,9 +557,9 @@ SECTIONS
557557
.buffer_heap (NOLOAD) : ALIGN(8)
558558
{
559559
. = ALIGN (32);
560-
_system_heap_start = ABSOLUTE(.);
560+
_buffer_heap_start = ABSOLUTE(.);
561561
. = . + HEAP_BUFFER_SIZE;
562-
_system_heap_end = ABSOLUTE(.);
562+
_buffer_heap_end = ABSOLUTE(.);
563563
} >buffer_heap :buffer_heap_phdr
564564

565565
.sof_stack (NOLOAD) : ALIGN(8)

‎src/platform/cannonlake/cannonlake.x.in‎

Lines changed: 62 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,21 @@ MEMORY
9898
sof_stack :
9999
org = SOF_STACK_END,
100100
len = SOF_STACK_BASE - SOF_STACK_END
101+
buffer_hp_heap :
102+
org = HEAP_HP_BUFFER_BASE,
103+
len = HEAP_HP_BUFFER_SIZE
104+
wnd0 :
105+
org = HP_SRAM_WIN0_BASE,
106+
len = HP_SRAM_WIN0_SIZE
107+
wnd1 :
108+
org = HP_SRAM_WIN1_BASE,
109+
len = HP_SRAM_WIN1_SIZE
110+
wnd2 :
111+
org = HP_SRAM_WIN2_BASE,
112+
len = HP_SRAM_WIN2_SIZE
113+
wnd3 :
114+
org = HP_SRAM_WIN3_BASE,
115+
len = HP_SRAM_WIN3_SIZE
101116
}
102117

103118
PHDRS
@@ -130,6 +145,11 @@ PHDRS
130145
runtime_heap_phdr PT_LOAD;
131146
buffer_heap_phdr PT_LOAD;
132147
sof_stack_phdr PT_LOAD;
148+
buffer_hp_heap_phdr PT_LOAD;
149+
wnd0_phdr PT_LOAD;
150+
wnd1_phdr PT_LOAD;
151+
wnd2_phdr PT_LOAD;
152+
wnd3_phdr PT_LOAD;
133153
}
134154

135155
/* Default entry point: */
@@ -166,6 +186,46 @@ SECTIONS
166186
_MemoryExceptionVector_text_end = ABSOLUTE(.);
167187
} >vector_memory_text :vector_memory_text_phdr
168188

189+
.buffer_hp_heap (NOLOAD) : ALIGN(8)
190+
{
191+
. = ALIGN (32);
192+
_buffer_hp_heap_start = ABSOLUTE(.);
193+
. = . + HEAP_HP_BUFFER_SIZE;
194+
_buffer_hp_heap_end = ABSOLUTE(.);
195+
} >buffer_hp_heap :buffer_hp_heap_phdr
196+
197+
.wnd0 (NOLOAD) : ALIGN(8)
198+
{
199+
. = ALIGN (32);
200+
_wnd0_start = ABSOLUTE(.);
201+
. = . + HP_SRAM_WIN0_SIZE;
202+
_wnd0_end = ABSOLUTE(.);
203+
} >wnd0 :wnd0_phdr
204+
205+
.wnd1 (NOLOAD) : ALIGN(8)
206+
{
207+
. = ALIGN (32);
208+
_wnd1_start = ABSOLUTE(.);
209+
. = . + HP_SRAM_WIN1_SIZE;
210+
_wnd1_end = ABSOLUTE(.);
211+
} >wnd1 :wnd1_phdr
212+
213+
.wnd2 (NOLOAD) : ALIGN(8)
214+
{
215+
. = ALIGN (32);
216+
_wnd2_start = ABSOLUTE(.);
217+
. = . + HP_SRAM_WIN2_SIZE;
218+
_wnd2_end = ABSOLUTE(.);
219+
} >wnd2 :wnd2_phdr
220+
221+
.wnd3 (NOLOAD) : ALIGN(8)
222+
{
223+
. = ALIGN (32);
224+
_wnd3_start = ABSOLUTE(.);
225+
. = . + HP_SRAM_WIN3_SIZE;
226+
_wnd3_end = ABSOLUTE(.);
227+
} >wnd3 :wnd3_phdr
228+
169229
.WindowVectors.text : ALIGN(4)
170230
{
171231
_WindowVectors_text_start = ABSOLUTE(.);
@@ -489,9 +549,9 @@ SECTIONS
489549
.buffer_heap (NOLOAD) : ALIGN(8)
490550
{
491551
. = ALIGN (32);
492-
_system_heap_start = ABSOLUTE(.);
552+
_buffer_heap_start = ABSOLUTE(.);
493553
. = . + HEAP_BUFFER_SIZE;
494-
_system_heap_end = ABSOLUTE(.);
554+
_buffer_heap_end = ABSOLUTE(.);
495555
} >buffer_heap :buffer_heap_phdr
496556

497557
.sof_stack (NOLOAD) : ALIGN(8)

‎src/platform/icelake/icelake.x.in‎

Lines changed: 62 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,21 @@ MEMORY
9898
sof_stack :
9999
org = SOF_STACK_END,
100100
len = SOF_STACK_BASE - SOF_STACK_END
101+
buffer_hp_heap :
102+
org = HEAP_HP_BUFFER_BASE,
103+
len = HEAP_HP_BUFFER_SIZE
104+
wnd0 :
105+
org = HP_SRAM_WIN0_BASE,
106+
len = HP_SRAM_WIN0_SIZE
107+
wnd1 :
108+
org = HP_SRAM_WIN1_BASE,
109+
len = HP_SRAM_WIN1_SIZE
110+
wnd2 :
111+
org = HP_SRAM_WIN2_BASE,
112+
len = HP_SRAM_WIN2_SIZE
113+
wnd3 :
114+
org = HP_SRAM_WIN3_BASE,
115+
len = HP_SRAM_WIN3_SIZE
101116
}
102117

103118
PHDRS
@@ -130,6 +145,11 @@ PHDRS
130145
runtime_heap_phdr PT_LOAD;
131146
buffer_heap_phdr PT_LOAD;
132147
sof_stack_phdr PT_LOAD;
148+
buffer_hp_heap_phdr PT_LOAD;
149+
wnd0_phdr PT_LOAD;
150+
wnd1_phdr PT_LOAD;
151+
wnd2_phdr PT_LOAD;
152+
wnd3_phdr PT_LOAD;
133153
}
134154

135155
/* Default entry point: */
@@ -166,6 +186,46 @@ SECTIONS
166186
_MemoryExceptionVector_text_end = ABSOLUTE(.);
167187
} >vector_memory_text :vector_memory_text_phdr
168188

189+
.buffer_hp_heap (NOLOAD) : ALIGN(8)
190+
{
191+
. = ALIGN (32);
192+
_buffer_hp_heap_start = ABSOLUTE(.);
193+
. = . + HEAP_HP_BUFFER_SIZE;
194+
_buffer_hp_heap_end = ABSOLUTE(.);
195+
} >buffer_hp_heap :buffer_hp_heap_phdr
196+
197+
.wnd0 (NOLOAD) : ALIGN(8)
198+
{
199+
. = ALIGN (32);
200+
_wnd0_start = ABSOLUTE(.);
201+
. = . + HP_SRAM_WIN0_SIZE;
202+
_wnd0_end = ABSOLUTE(.);
203+
} >wnd0 :wnd0_phdr
204+
205+
.wnd1 (NOLOAD) : ALIGN(8)
206+
{
207+
. = ALIGN (32);
208+
_wnd1_start = ABSOLUTE(.);
209+
. = . + HP_SRAM_WIN1_SIZE;
210+
_wnd1_end = ABSOLUTE(.);
211+
} >wnd1 :wnd1_phdr
212+
213+
.wnd2 (NOLOAD) : ALIGN(8)
214+
{
215+
. = ALIGN (32);
216+
_wnd2_start = ABSOLUTE(.);
217+
. = . + HP_SRAM_WIN2_SIZE;
218+
_wnd2_end = ABSOLUTE(.);
219+
} >wnd2 :wnd2_phdr
220+
221+
.wnd3 (NOLOAD) : ALIGN(8)
222+
{
223+
. = ALIGN (32);
224+
_wnd3_start = ABSOLUTE(.);
225+
. = . + HP_SRAM_WIN3_SIZE;
226+
_wnd3_end = ABSOLUTE(.);
227+
} >wnd3 :wnd3_phdr
228+
169229
.WindowVectors.text : ALIGN(4)
170230
{
171231
_WindowVectors_text_start = ABSOLUTE(.);
@@ -489,9 +549,9 @@ SECTIONS
489549
.buffer_heap (NOLOAD) : ALIGN(8)
490550
{
491551
. = ALIGN (32);
492-
_system_heap_start = ABSOLUTE(.);
552+
_buffer_heap_start = ABSOLUTE(.);
493553
. = . + HEAP_BUFFER_SIZE;
494-
_system_heap_end = ABSOLUTE(.);
554+
_buffer_heap_end = ABSOLUTE(.);
495555
} >buffer_heap :buffer_heap_phdr
496556

497557
.sof_stack (NOLOAD) : ALIGN(8)

0 commit comments

Comments
 (0)