OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

platform: byt: do not use vector addresses from core-isa.h 

This patch copies vector addresses for baytrail platform
from core-isa.h to memory.h. This way we won't overwrite
default xtensa addresses, when updating xtensa headers.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
This commit is contained in:
Tomasz Lauda 2019-08-01 11:07:11 +02:00 committed by Tomasz Lauda
parent bdde5013e1
commit 5efd0c5e81
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/platform/baytrail/baytrail.x.in
View File

@ -8,78 +8,77 @@
*/ */
#include <sof/lib/memory.h> #include <sof/lib/memory.h>
#include <xtensa/config/core-isa.h>
OUTPUT_ARCH(xtensa) OUTPUT_ARCH(xtensa)
MEMORY MEMORY
{ {
vector_reset_text : vector_reset_text :
org = XCHAL_RESET_VECTOR0_PADDR, org = SOF_MEM_RESET_VECT,
len = SOF_MEM_RESET_TEXT_SIZE len = SOF_MEM_RESET_TEXT_SIZE
vector_reset_lit : vector_reset_lit :
org = XCHAL_RESET_VECTOR0_PADDR + SOF_MEM_RESET_TEXT_SIZE, org = SOF_MEM_RESET_VECT + SOF_MEM_RESET_TEXT_SIZE,
len = SOF_MEM_RESET_LIT_SIZE len = SOF_MEM_RESET_LIT_SIZE
vector_base_text : vector_base_text :
org = XCHAL_VECBASE_RESET_PADDR, org = SOF_MEM_VECBASE,
len = SOF_MEM_VECBASE_LIT_SIZE len = SOF_MEM_VECBASE_LIT_SIZE
vector_int2_lit : vector_int2_lit :
org = XCHAL_INTLEVEL2_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, org = SOF_MEM_INTLEVEL2_VECT - SOF_MEM_VECT_LIT_SIZE,
len = SOF_MEM_VECT_LIT_SIZE len = SOF_MEM_VECT_LIT_SIZE
vector_int2_text : vector_int2_text :
org = XCHAL_INTLEVEL2_VECTOR_PADDR, org = SOF_MEM_INTLEVEL2_VECT,
len = SOF_MEM_VECT_TEXT_SIZE len = SOF_MEM_VECT_TEXT_SIZE
vector_int3_lit : vector_int3_lit :
org = XCHAL_INTLEVEL3_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, org = SOF_MEM_INTLEVEL3_VECT - SOF_MEM_VECT_LIT_SIZE,
len = SOF_MEM_VECT_LIT_SIZE len = SOF_MEM_VECT_LIT_SIZE
vector_int3_text : vector_int3_text :
org = XCHAL_INTLEVEL3_VECTOR_PADDR, org = SOF_MEM_INTLEVEL3_VECT,
len = SOF_MEM_VECT_TEXT_SIZE len = SOF_MEM_VECT_TEXT_SIZE
vector_int4_lit : vector_int4_lit :
org = XCHAL_INTLEVEL4_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, org = SOF_MEM_INTLEVEL4_VECT - SOF_MEM_VECT_LIT_SIZE,
len = SOF_MEM_VECT_LIT_SIZE len = SOF_MEM_VECT_LIT_SIZE
vector_int4_text : vector_int4_text :
org = XCHAL_INTLEVEL4_VECTOR_PADDR, org = SOF_MEM_INTLEVEL4_VECT,
len = SOF_MEM_VECT_TEXT_SIZE len = SOF_MEM_VECT_TEXT_SIZE
vector_int5_lit : vector_int5_lit :
org = XCHAL_INTLEVEL5_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, org = SOF_MEM_INTLEVEL5_VECT - SOF_MEM_VECT_LIT_SIZE,
len = SOF_MEM_VECT_LIT_SIZE len = SOF_MEM_VECT_LIT_SIZE
vector_int5_text : vector_int5_text :
org = XCHAL_INTLEVEL5_VECTOR_PADDR, org = SOF_MEM_INTLEVEL5_VECT,
len = SOF_MEM_VECT_TEXT_SIZE len = SOF_MEM_VECT_TEXT_SIZE
vector_int6_lit : vector_int6_lit :
org = XCHAL_INTLEVEL6_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, org = SOF_MEM_INTLEVEL6_VECT - SOF_MEM_VECT_LIT_SIZE,
len = SOF_MEM_VECT_LIT_SIZE len = SOF_MEM_VECT_LIT_SIZE
vector_int6_text : vector_int6_text :
org = XCHAL_INTLEVEL6_VECTOR_PADDR, org = SOF_MEM_INTLEVEL6_VECT,
len = SOF_MEM_VECT_TEXT_SIZE len = SOF_MEM_VECT_TEXT_SIZE
vector_int7_lit : vector_int7_lit :
org = XCHAL_INTLEVEL7_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, org = SOF_MEM_INTLEVEL7_VECT - SOF_MEM_VECT_LIT_SIZE,
len = SOF_MEM_VECT_LIT_SIZE len = SOF_MEM_VECT_LIT_SIZE
vector_int7_text : vector_int7_text :
org = XCHAL_INTLEVEL7_VECTOR_PADDR, org = SOF_MEM_INTLEVEL7_VECT,
len = SOF_MEM_VECT_TEXT_SIZE len = SOF_MEM_VECT_TEXT_SIZE
vector_kernel_lit : vector_kernel_lit :
org = XCHAL_KERNEL_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, org = SOF_MEM_KERNEL_VECT - SOF_MEM_VECT_LIT_SIZE,
len = SOF_MEM_VECT_LIT_SIZE len = SOF_MEM_VECT_LIT_SIZE
vector_kernel_text : vector_kernel_text :
org = XCHAL_KERNEL_VECTOR_PADDR, org = SOF_MEM_KERNEL_VECT,
len = SOF_MEM_VECT_TEXT_SIZE len = SOF_MEM_VECT_TEXT_SIZE
vector_user_lit : vector_user_lit :
org = XCHAL_USER_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, org = SOF_MEM_USER_VECT - SOF_MEM_VECT_LIT_SIZE,
len = SOF_MEM_VECT_LIT_SIZE len = SOF_MEM_VECT_LIT_SIZE
vector_user_text : vector_user_text :
org = XCHAL_USER_VECTOR_PADDR, org = SOF_MEM_USER_VECT,
len = SOF_MEM_VECT_TEXT_SIZE len = SOF_MEM_VECT_TEXT_SIZE
vector_double_lit : vector_double_lit :
org = XCHAL_DOUBLEEXC_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, org = SOF_MEM_DOUBLEEXC_VECT - SOF_MEM_VECT_LIT_SIZE,
len = SOF_MEM_VECT_LIT_SIZE len = SOF_MEM_VECT_LIT_SIZE
vector_double_text : vector_double_text :
org = XCHAL_DOUBLEEXC_VECTOR_PADDR, org = SOF_MEM_DOUBLEEXC_VECT,
len = SOF_MEM_VECT_TEXT_SIZE len = SOF_MEM_VECT_TEXT_SIZE
sof_text_start : sof_text_start :
org = XCHAL_DOUBLEEXC_VECTOR_PADDR + SOF_MEM_VECT_SIZE, org = SOF_MEM_DOUBLEEXC_VECT + SOF_MEM_VECT_SIZE,
len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_DOUBLEEXC_VECTOR_PADDR + SOF_MEM_VECT_SIZE) len = (IRAM_BASE + IRAM_SIZE) - (SOF_MEM_DOUBLEEXC_VECT + SOF_MEM_VECT_SIZE)
sof_data_ro : sof_data_ro :
org = DRAM0_BASE, org = DRAM0_BASE,
len = SOF_MEM_RO_SIZE len = SOF_MEM_RO_SIZE
@ -147,7 +146,7 @@ ENTRY(_ResetVector)
_rom_store_table = 0; _rom_store_table = 0;
/* ABI0 does not use Window base */ /* ABI0 does not use Window base */
PROVIDE(_memmap_vecbase_reset = XCHAL_VECBASE_RESET_PADDR); PROVIDE(_memmap_vecbase_reset = SOF_MEM_VECBASE);
/* Various memory-map dependent cache attribute settings: */ /* Various memory-map dependent cache attribute settings: */
_memmap_cacheattr_wb_base = 0x44024000; _memmap_cacheattr_wb_base = 0x44024000;

14
src/platform/baytrail/include/platform/lib/memory.h
View File

@ -136,7 +136,19 @@ void platform_init_memmap(void);
#define SOF_STACK_BASE (DRAM0_BASE + DRAM0_SIZE) #define SOF_STACK_BASE (DRAM0_BASE + DRAM0_SIZE)
#define SOF_STACK_END (SOF_STACK_BASE - SOF_STACK_TOTAL_SIZE) #define SOF_STACK_END (SOF_STACK_BASE - SOF_STACK_TOTAL_SIZE)
/* Vector and literal sizes - not in core-isa.h */ /* Vector and literal addresses and sizes - do not use core-isa.h */
#define SOF_MEM_RESET_VECT 0xff2c0000
#define SOF_MEM_VECBASE 0xff2c0400
#define SOF_MEM_INTLEVEL2_VECT 0xff2c057c
#define SOF_MEM_INTLEVEL3_VECT 0xff2c059c
#define SOF_MEM_INTLEVEL4_VECT 0xff2c05bc
#define SOF_MEM_INTLEVEL5_VECT 0xff2c05dc
#define SOF_MEM_INTLEVEL6_VECT 0xff2c05fc
#define SOF_MEM_INTLEVEL7_VECT 0xff2c061c
#define SOF_MEM_KERNEL_VECT 0xff2c063c
#define SOF_MEM_USER_VECT 0xff2c065c
#define SOF_MEM_DOUBLEEXC_VECT 0xff2c067c
#define SOF_MEM_VECT_LIT_SIZE 0x4 #define SOF_MEM_VECT_LIT_SIZE 0x4
#define SOF_MEM_VECT_TEXT_SIZE 0x1c #define SOF_MEM_VECT_TEXT_SIZE 0x1c
#define SOF_MEM_VECT_SIZE (SOF_MEM_VECT_TEXT_SIZE + \ #define SOF_MEM_VECT_SIZE (SOF_MEM_VECT_TEXT_SIZE + \