Previous attempts left file in DOS mode

Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com --- src/platform/baytrail/baytrail.x.in | 1016 +++++++++++++++++------------------ 1 file changed, 508 insertions(+), 508 deletions(-)

diff --git a/src/platform/baytrail/baytrail.x.in b/src/platform/baytrail/baytrail.x.in index febe039..6692cf7 100755 --- a/src/platform/baytrail/baytrail.x.in +++ b/src/platform/baytrail/baytrail.x.in @@ -1,508 +1,508 @@ -/* - * Linker Script for Baytrail. - * - * This script is run through the GNU C preprocessor to align the memory - * offsets with headers. - * - * Use spaces for formatting as cpp ignore tab sizes. - */ - -#include <platform/memory.h> -#include <xtensa/config/core-isa.h> - -OUTPUT_ARCH(xtensa) - -MEMORY -{ - vector_reset_text : - org = XCHAL_RESET_VECTOR0_PADDR, - len = REEF_MEM_RESET_TEXT_SIZE - vector_reset_lit : - org = XCHAL_RESET_VECTOR0_PADDR + REEF_MEM_RESET_TEXT_SIZE, - len = REEF_MEM_RESET_LIT_SIZE - vector_base_text : - org = XCHAL_VECBASE_RESET_PADDR, - len = REEF_MEM_VECBASE_LIT_SIZE - vector_int2_lit : - org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int2_text : - org = XCHAL_INTLEVEL2_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int3_lit : - org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int3_text : - org = XCHAL_INTLEVEL3_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int4_lit : - org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int4_text : - org = XCHAL_INTLEVEL4_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int5_lit : - org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int5_text : - org = XCHAL_INTLEVEL5_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int6_lit : - org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int6_text : - org = XCHAL_INTLEVEL6_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int7_lit : - org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int7_text : - org = XCHAL_INTLEVEL7_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_kernel_lit : - org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_kernel_text : - org = XCHAL_KERNEL_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_user_lit : - org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_user_text : - org = XCHAL_USER_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_double_lit : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_double_text : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - reef_text_start : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR + REEF_MEM_VECT_SIZE, - len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_DOUBLEEXC_VECTOR_PADDR + REEF_MEM_VECT_SIZE) - reef_data_ro : - org = DRAM0_BASE, - len = REEF_MEM_RO_SIZE - reef_data : - org = DRAM0_BASE + REEF_MEM_RO_SIZE, - len = HEAP_SYSTEM_BASE - (DRAM0_BASE + REEF_MEM_RO_SIZE) - system_heap : - org = HEAP_SYSTEM_BASE, - len = HEAP_SYSTEM_SIZE - runtime_heap : - org = HEAP_RUNTIME_BASE, - len = HEAP_RUNTIME_SIZE - buffer_heap : - org = HEAP_BUFFER_BASE, - len = HEAP_BUFFER_SIZE - reef_stack : - org = REEF_STACK_END, - len = REEF_STACK_BASE - REEF_STACK_END -} - -PHDRS -{ - vector_reset_text_phdr PT_LOAD; - vector_reset_lit_phdr PT_LOAD; - vector_base_text_phdr PT_LOAD; - vector_base_lit_phdr PT_LOAD; - vector_int2_text_phdr PT_LOAD; - vector_int2_lit_phdr PT_LOAD; - vector_int3_text_phdr PT_LOAD; - vector_int3_lit_phdr PT_LOAD; - vector_int4_text_phdr PT_LOAD; - vector_int4_lit_phdr PT_LOAD; - vector_int5_text_phdr PT_LOAD; - vector_int5_lit_phdr PT_LOAD; - vector_int6_text_phdr PT_LOAD; - vector_int6_lit_phdr PT_LOAD; - vector_int7_text_phdr PT_LOAD; - vector_int7_lit_phdr PT_LOAD; - vector_kernel_text_phdr PT_LOAD; - vector_kernel_lit_phdr PT_LOAD; - vector_user_text_phdr PT_LOAD; - vector_user_lit_phdr PT_LOAD; - vector_double_text_phdr PT_LOAD; - vector_double_lit_phdr PT_LOAD; - reef_text_start_phdr PT_LOAD; - reef_data_ro_phdr PT_LOAD; - reef_data_phdr PT_LOAD; - reef_data_bss_phdr PT_LOAD; - system_heap_phdr PT_LOAD; - runtime_heap_phdr PT_LOAD; - buffer_heap_phdr PT_LOAD; - reef_stack_phdr PT_LOAD; -} - -/* Default entry point: */ -ENTRY(_ResetVector) -_rom_store_table = 0; - -/* ABI0 does not use Window base */ -PROVIDE(_memmap_vecbase_reset = XCHAL_VECBASE_RESET_PADDR); - -/* Various memory-map dependent cache attribute settings: */ -_memmap_cacheattr_wb_base = 0x44024000; -_memmap_cacheattr_wt_base = 0x11021000; -_memmap_cacheattr_bp_base = 0x22022000; -_memmap_cacheattr_unused_mask = 0x00F00FFF; -_memmap_cacheattr_wb_trapnull = 0x4422422F; -_memmap_cacheattr_wba_trapnull = 0x4422422F; -_memmap_cacheattr_wbna_trapnull = 0x25222222; -_memmap_cacheattr_wt_trapnull = 0x1122122F; -_memmap_cacheattr_bp_trapnull = 0x2222222F; -_memmap_cacheattr_wb_strict = 0x44F24FFF; -_memmap_cacheattr_wt_strict = 0x11F21FFF; -_memmap_cacheattr_bp_strict = 0x22F22FFF; -_memmap_cacheattr_wb_allvalid = 0x44224222; -_memmap_cacheattr_wt_allvalid = 0x11221222; -_memmap_cacheattr_bp_allvalid = 0x22222222; -PROVIDE(_memmap_cacheattr_reset = _memmap_cacheattr_wbna_trapnull); - -SECTIONS -{ - .ResetVector.text : ALIGN(4) - { - _ResetVector_text_start = ABSOLUTE(.); - KEEP (*(.ResetVector.text)) - _ResetVector_text_end = ABSOLUTE(.); - } >vector_reset_text :vector_reset_text_phdr - - .ResetVector.literal : ALIGN(4) - { - _ResetVector_literal_start = ABSOLUTE(.); - *(.ResetVector.literal) - _ResetVector_literal_end = ABSOLUTE(.); - } >vector_reset_lit :vector_reset_lit_phdr - - .WindowVectors.text : ALIGN(4) - { - _WindowVectors_text_start = ABSOLUTE(.); - KEEP (*(.WindowVectors.text)) - _WindowVectors_text_end = ABSOLUTE(.); - } >vector_base_text :vector_base_text_phdr - - .Level2InterruptVector.literal : ALIGN(4) - { - _Level2InterruptVector_literal_start = ABSOLUTE(.); - *(.Level2InterruptVector.literal) - _Level2InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int2_lit :vector_int2_lit_phdr - - .Level2InterruptVector.text : ALIGN(4) - { - _Level2InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level2InterruptVector.text)) - _Level2InterruptVector_text_end = ABSOLUTE(.); - } >vector_int2_text :vector_int2_text_phdr - - .Level3InterruptVector.literal : ALIGN(4) - { - _Level3InterruptVector_literal_start = ABSOLUTE(.); - *(.Level3InterruptVector.literal) - _Level3InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int3_lit :vector_int3_lit_phdr - - .Level3InterruptVector.text : ALIGN(4) - { - _Level3InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level3InterruptVector.text)) - _Level3InterruptVector_text_end = ABSOLUTE(.); - } >vector_int3_text :vector_int3_text_phdr - - .Level4InterruptVector.literal : ALIGN(4) - { - _Level4InterruptVector_literal_start = ABSOLUTE(.); - *(.Level4InterruptVector.literal) - _Level4InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int4_lit :vector_int4_lit_phdr - - .Level4InterruptVector.text : ALIGN(4) - { - _Level4InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level4InterruptVector.text)) - _Level4InterruptVector_text_end = ABSOLUTE(.); - } >vector_int4_text :vector_int4_text_phdr - - .Level5InterruptVector.literal : ALIGN(4) - { - _Level5InterruptVector_literal_start = ABSOLUTE(.); - *(.Level5InterruptVector.literal) - _Level5InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int5_lit :vector_int5_lit_phdr - - .Level5InterruptVector.text : ALIGN(4) - { - _Level5InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level5InterruptVector.text)) - _Level5InterruptVector_text_end = ABSOLUTE(.); - } >vector_int5_text :vector_int5_text_phdr - - .DebugExceptionVector.literal : ALIGN(4) - { - _DebugExceptionVector_literal_start = ABSOLUTE(.); - *(.DebugExceptionVector.literal) - _DebugExceptionVector_literal_end = ABSOLUTE(.); - } >vector_int6_lit :vector_int6_lit_phdr - - .DebugExceptionVector.text : ALIGN(4) - { - _DebugExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.DebugExceptionVector.text)) - _DebugExceptionVector_text_end = ABSOLUTE(.); - } >vector_int6_text :vector_int6_text_phdr - - .NMIExceptionVector.literal : ALIGN(4) - { - _NMIExceptionVector_literal_start = ABSOLUTE(.); - *(.NMIExceptionVector.literal) - _NMIExceptionVector_literal_end = ABSOLUTE(.); - } >vector_int7_lit :vector_int7_lit_phdr - - .NMIExceptionVector.text : ALIGN(4) - { - _NMIExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.NMIExceptionVector.text)) - _NMIExceptionVector_text_end = ABSOLUTE(.); - } >vector_int7_text :vector_int7_text_phdr - - .KernelExceptionVector.literal : ALIGN(4) - { - _KernelExceptionVector_literal_start = ABSOLUTE(.); - *(.KernelExceptionVector.literal) - _KernelExceptionVector_literal_end = ABSOLUTE(.); - } >vector_kernel_lit :vector_kernel_lit_phdr - - .KernelExceptionVector.text : ALIGN(4) - { - _KernelExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.KernelExceptionVector.text)) - _KernelExceptionVector_text_end = ABSOLUTE(.); - } >vector_kernel_text :vector_kernel_text_phdr - - .UserExceptionVector.literal : ALIGN(4) - { - _UserExceptionVector_literal_start = ABSOLUTE(.); - *(.UserExceptionVector.literal) - _UserExceptionVector_literal_end = ABSOLUTE(.); - } >vector_user_lit :vector_user_lit_phdr - - .UserExceptionVector.text : ALIGN(4) - { - _UserExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.UserExceptionVector.text)) - _UserExceptionVector_text_end = ABSOLUTE(.); - } >vector_user_text :vector_user_text_phdr - - .DoubleExceptionVector.literal : ALIGN(4) - { - _DoubleExceptionVector_literal_start = ABSOLUTE(.); - *(.DoubleExceptionVector.literal) - _DoubleExceptionVector_literal_end = ABSOLUTE(.); - } >vector_double_lit :vector_double_lit_phdr - - .DoubleExceptionVector.text : ALIGN(4) - { - _DoubleExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.DoubleExceptionVector.text)) - _DoubleExceptionVector_text_end = ABSOLUTE(.); - } >vector_double_text :vector_double_text_phdr - - .text : ALIGN(4) - { - _stext = .; - _text_start = ABSOLUTE(.); - *(.entry.text) - *(.init.literal) - KEEP(*(.init)) - *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*) - *(.fini.literal) - KEEP(*(.fini)) - *(.gnu.version) - _text_end = ABSOLUTE(.); - _etext = .; - } >reef_text_start :reef_text_start_phdr - - .reset.rodata : ALIGN(4) - { - _reset_rodata_start = ABSOLUTE(.); - *(.reset.rodata) - _reset_rodata_end = ABSOLUTE(.); - } >reef_data_ro :reef_data_ro_phdr - - .rodata : ALIGN(4) - { - _rodata_start = ABSOLUTE(.); - *(.rodata) - *(.rodata.*) - *(.gnu.linkonce.r.*) - *(.rodata1) - __XT_EXCEPTION_TABLE__ = ABSOLUTE(.); - KEEP (*(.xt_except_table)) - KEEP (*(.gcc_except_table)) - *(.gnu.linkonce.e.*) - *(.gnu.version_r) - KEEP (*(.eh_frame)) - /* C++ constructor and destructor tables, properly ordered: */ - KEEP (*crtbegin.o(.ctors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - KEEP (*crtbegin.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - /* C++ exception handlers table: */ - __XT_EXCEPTION_DESCS__ = ABSOLUTE(.); - *(.xt_except_desc) - *(.gnu.linkonce.h.*) - __XT_EXCEPTION_DESCS_END__ = ABSOLUTE(.); - *(.xt_except_desc_end) - *(.dynamic) - *(.gnu.version_d) - . = ALIGN(4); /* this table MUST be 4-byte aligned */ - _bss_table_start = ABSOLUTE(.); - LONG(_bss_start) - LONG(_bss_end) - _bss_table_end = ABSOLUTE(.); - _rodata_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr - - .data : ALIGN(4) - { - _data_start = ABSOLUTE(.); - *(.data) - *(.data.*) - *(.gnu.linkonce.d.*) - KEEP(*(.gnu.linkonce.d.*personality*)) - *(.data1) - *(.sdata) - *(.sdata.*) - *(.gnu.linkonce.s.*) - *(.sdata2) - *(.sdata2.*) - *(.gnu.linkonce.s2.*) - KEEP(*(.jcr)) - _data_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr - - .lit4 : ALIGN(4) - { - _lit4_start = ABSOLUTE(.); - *(*.lit4) - *(.lit4.*) - *(.gnu.linkonce.lit4.*) - _lit4_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr - - .bss (NOLOAD) : ALIGN(8) - { - . = ALIGN (8); - _bss_start = ABSOLUTE(.); - *(.dynsbss) - *(.sbss) - *(.sbss.*) - *(.gnu.linkonce.sb.*) - *(.scommon) - *(.sbss2) - *(.sbss2.*) - *(.gnu.linkonce.sb2.*) - *(.dynbss) - *(.bss) - *(.bss.*) - *(.gnu.linkonce.b.*) - *(COMMON) - . = ALIGN (8); - _bss_end = ABSOLUTE(.); - } >reef_data :reef_data_bss_phdr - - /* stack */ - _end = REEF_STACK_END; - PROVIDE(end = REEF_STACK_END); - _stack_sentry = REEF_STACK_END; - __stack = REEF_STACK_BASE; - - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - - .xt.insn 0 : - { - KEEP (*(.xt.insn)) - KEEP (*(.gnu.linkonce.x.*)) - } - .xt.prop 0 : - { - KEEP (*(.xt.prop)) - KEEP (*(.xt.prop.*)) - KEEP (*(.gnu.linkonce.prop.*)) - } - .xt.lit 0 : - { - KEEP (*(.xt.lit)) - KEEP (*(.xt.lit.*)) - KEEP (*(.gnu.linkonce.p.*)) - } - .xt.profile_range 0 : - { - KEEP (*(.xt.profile_range)) - KEEP (*(.gnu.linkonce.profile_range.*)) - } - .xt.profile_ranges 0 : - { - KEEP (*(.xt.profile_ranges)) - KEEP (*(.gnu.linkonce.xt.profile_ranges.*)) - } - .xt.profile_files 0 : - { - KEEP (*(.xt.profile_files)) - KEEP (*(.gnu.linkonce.xt.profile_files.*)) - } - - .system_heap (NOLOAD) : ALIGN(8) - { - . = ALIGN (32); - _system_heap_start = ABSOLUTE(.); - . = . + HEAP_SYSTEM_SIZE; - _system_heap_end = ABSOLUTE(.); - } >system_heap :system_heap_phdr - - .runtime_heap (NOLOAD) : ALIGN(8) - { - . = ALIGN (32); - _runtime_heap_start = ABSOLUTE(.); - . = . + HEAP_RUNTIME_SIZE; - _runtime_heap_end = ABSOLUTE(.); - } >runtime_heap :runtime_heap_phdr - - .buffer_heap (NOLOAD) : ALIGN(8) - { - . = ALIGN (32); - _system_heap_start = ABSOLUTE(.); - . = . + HEAP_BUFFER_SIZE; - _system_heap_end = ABSOLUTE(.); - } >buffer_heap :buffer_heap_phdr - - .reef_stack (NOLOAD) : ALIGN(8) - { - . = ALIGN (4096); - _reef_stack_start = ABSOLUTE(.); - . = . + REEF_STACK_SIZE; - _reef_stack_end = ABSOLUTE(.); - } >reef_stack :reef_stack_phdr -} - +/* + * Linker Script for Baytrail. + * + * This script is run through the GNU C preprocessor to align the memory + * offsets with headers. + * + * Use spaces for formatting as cpp ignore tab sizes. + */ + +#include <platform/memory.h> +#include <xtensa/config/core-isa.h> + +OUTPUT_ARCH(xtensa) + +MEMORY +{ + vector_reset_text : + org = XCHAL_RESET_VECTOR0_PADDR, + len = REEF_MEM_RESET_TEXT_SIZE + vector_reset_lit : + org = XCHAL_RESET_VECTOR0_PADDR + REEF_MEM_RESET_TEXT_SIZE, + len = REEF_MEM_RESET_LIT_SIZE + vector_base_text : + org = XCHAL_VECBASE_RESET_PADDR, + len = REEF_MEM_VECBASE_LIT_SIZE + vector_int2_lit : + org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int2_text : + org = XCHAL_INTLEVEL2_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int3_lit : + org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int3_text : + org = XCHAL_INTLEVEL3_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int4_lit : + org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int4_text : + org = XCHAL_INTLEVEL4_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int5_lit : + org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int5_text : + org = XCHAL_INTLEVEL5_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int6_lit : + org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int6_text : + org = XCHAL_INTLEVEL6_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int7_lit : + org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int7_text : + org = XCHAL_INTLEVEL7_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_kernel_lit : + org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_kernel_text : + org = XCHAL_KERNEL_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_user_lit : + org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_user_text : + org = XCHAL_USER_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_double_lit : + org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_double_text : + org = XCHAL_DOUBLEEXC_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + reef_text_start : + org = XCHAL_DOUBLEEXC_VECTOR_PADDR + REEF_MEM_VECT_SIZE, + len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_DOUBLEEXC_VECTOR_PADDR + REEF_MEM_VECT_SIZE) + reef_data_ro : + org = DRAM0_BASE, + len = REEF_MEM_RO_SIZE + reef_data : + org = DRAM0_BASE + REEF_MEM_RO_SIZE, + len = HEAP_SYSTEM_BASE - (DRAM0_BASE + REEF_MEM_RO_SIZE) + system_heap : + org = HEAP_SYSTEM_BASE, + len = HEAP_SYSTEM_SIZE + runtime_heap : + org = HEAP_RUNTIME_BASE, + len = HEAP_RUNTIME_SIZE + buffer_heap : + org = HEAP_BUFFER_BASE, + len = HEAP_BUFFER_SIZE + reef_stack : + org = REEF_STACK_END, + len = REEF_STACK_BASE - REEF_STACK_END +} + +PHDRS +{ + vector_reset_text_phdr PT_LOAD; + vector_reset_lit_phdr PT_LOAD; + vector_base_text_phdr PT_LOAD; + vector_base_lit_phdr PT_LOAD; + vector_int2_text_phdr PT_LOAD; + vector_int2_lit_phdr PT_LOAD; + vector_int3_text_phdr PT_LOAD; + vector_int3_lit_phdr PT_LOAD; + vector_int4_text_phdr PT_LOAD; + vector_int4_lit_phdr PT_LOAD; + vector_int5_text_phdr PT_LOAD; + vector_int5_lit_phdr PT_LOAD; + vector_int6_text_phdr PT_LOAD; + vector_int6_lit_phdr PT_LOAD; + vector_int7_text_phdr PT_LOAD; + vector_int7_lit_phdr PT_LOAD; + vector_kernel_text_phdr PT_LOAD; + vector_kernel_lit_phdr PT_LOAD; + vector_user_text_phdr PT_LOAD; + vector_user_lit_phdr PT_LOAD; + vector_double_text_phdr PT_LOAD; + vector_double_lit_phdr PT_LOAD; + reef_text_start_phdr PT_LOAD; + reef_data_ro_phdr PT_LOAD; + reef_data_phdr PT_LOAD; + reef_data_bss_phdr PT_LOAD; + system_heap_phdr PT_LOAD; + runtime_heap_phdr PT_LOAD; + buffer_heap_phdr PT_LOAD; + reef_stack_phdr PT_LOAD; +} + +/* Default entry point: */ +ENTRY(_ResetVector) +_rom_store_table = 0; + +/* ABI0 does not use Window base */ +PROVIDE(_memmap_vecbase_reset = XCHAL_VECBASE_RESET_PADDR); + +/* Various memory-map dependent cache attribute settings: */ +_memmap_cacheattr_wb_base = 0x44024000; +_memmap_cacheattr_wt_base = 0x11021000; +_memmap_cacheattr_bp_base = 0x22022000; +_memmap_cacheattr_unused_mask = 0x00F00FFF; +_memmap_cacheattr_wb_trapnull = 0x4422422F; +_memmap_cacheattr_wba_trapnull = 0x4422422F; +_memmap_cacheattr_wbna_trapnull = 0x25222222; +_memmap_cacheattr_wt_trapnull = 0x1122122F; +_memmap_cacheattr_bp_trapnull = 0x2222222F; +_memmap_cacheattr_wb_strict = 0x44F24FFF; +_memmap_cacheattr_wt_strict = 0x11F21FFF; +_memmap_cacheattr_bp_strict = 0x22F22FFF; +_memmap_cacheattr_wb_allvalid = 0x44224222; +_memmap_cacheattr_wt_allvalid = 0x11221222; +_memmap_cacheattr_bp_allvalid = 0x22222222; +PROVIDE(_memmap_cacheattr_reset = _memmap_cacheattr_wbna_trapnull); + +SECTIONS +{ + .ResetVector.text : ALIGN(4) + { + _ResetVector_text_start = ABSOLUTE(.); + KEEP (*(.ResetVector.text)) + _ResetVector_text_end = ABSOLUTE(.); + } >vector_reset_text :vector_reset_text_phdr + + .ResetVector.literal : ALIGN(4) + { + _ResetVector_literal_start = ABSOLUTE(.); + *(.ResetVector.literal) + _ResetVector_literal_end = ABSOLUTE(.); + } >vector_reset_lit :vector_reset_lit_phdr + + .WindowVectors.text : ALIGN(4) + { + _WindowVectors_text_start = ABSOLUTE(.); + KEEP (*(.WindowVectors.text)) + _WindowVectors_text_end = ABSOLUTE(.); + } >vector_base_text :vector_base_text_phdr + + .Level2InterruptVector.literal : ALIGN(4) + { + _Level2InterruptVector_literal_start = ABSOLUTE(.); + *(.Level2InterruptVector.literal) + _Level2InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int2_lit :vector_int2_lit_phdr + + .Level2InterruptVector.text : ALIGN(4) + { + _Level2InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level2InterruptVector.text)) + _Level2InterruptVector_text_end = ABSOLUTE(.); + } >vector_int2_text :vector_int2_text_phdr + + .Level3InterruptVector.literal : ALIGN(4) + { + _Level3InterruptVector_literal_start = ABSOLUTE(.); + *(.Level3InterruptVector.literal) + _Level3InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int3_lit :vector_int3_lit_phdr + + .Level3InterruptVector.text : ALIGN(4) + { + _Level3InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level3InterruptVector.text)) + _Level3InterruptVector_text_end = ABSOLUTE(.); + } >vector_int3_text :vector_int3_text_phdr + + .Level4InterruptVector.literal : ALIGN(4) + { + _Level4InterruptVector_literal_start = ABSOLUTE(.); + *(.Level4InterruptVector.literal) + _Level4InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int4_lit :vector_int4_lit_phdr + + .Level4InterruptVector.text : ALIGN(4) + { + _Level4InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level4InterruptVector.text)) + _Level4InterruptVector_text_end = ABSOLUTE(.); + } >vector_int4_text :vector_int4_text_phdr + + .Level5InterruptVector.literal : ALIGN(4) + { + _Level5InterruptVector_literal_start = ABSOLUTE(.); + *(.Level5InterruptVector.literal) + _Level5InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int5_lit :vector_int5_lit_phdr + + .Level5InterruptVector.text : ALIGN(4) + { + _Level5InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level5InterruptVector.text)) + _Level5InterruptVector_text_end = ABSOLUTE(.); + } >vector_int5_text :vector_int5_text_phdr + + .DebugExceptionVector.literal : ALIGN(4) + { + _DebugExceptionVector_literal_start = ABSOLUTE(.); + *(.DebugExceptionVector.literal) + _DebugExceptionVector_literal_end = ABSOLUTE(.); + } >vector_int6_lit :vector_int6_lit_phdr + + .DebugExceptionVector.text : ALIGN(4) + { + _DebugExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.DebugExceptionVector.text)) + _DebugExceptionVector_text_end = ABSOLUTE(.); + } >vector_int6_text :vector_int6_text_phdr + + .NMIExceptionVector.literal : ALIGN(4) + { + _NMIExceptionVector_literal_start = ABSOLUTE(.); + *(.NMIExceptionVector.literal) + _NMIExceptionVector_literal_end = ABSOLUTE(.); + } >vector_int7_lit :vector_int7_lit_phdr + + .NMIExceptionVector.text : ALIGN(4) + { + _NMIExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.NMIExceptionVector.text)) + _NMIExceptionVector_text_end = ABSOLUTE(.); + } >vector_int7_text :vector_int7_text_phdr + + .KernelExceptionVector.literal : ALIGN(4) + { + _KernelExceptionVector_literal_start = ABSOLUTE(.); + *(.KernelExceptionVector.literal) + _KernelExceptionVector_literal_end = ABSOLUTE(.); + } >vector_kernel_lit :vector_kernel_lit_phdr + + .KernelExceptionVector.text : ALIGN(4) + { + _KernelExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.KernelExceptionVector.text)) + _KernelExceptionVector_text_end = ABSOLUTE(.); + } >vector_kernel_text :vector_kernel_text_phdr + + .UserExceptionVector.literal : ALIGN(4) + { + _UserExceptionVector_literal_start = ABSOLUTE(.); + *(.UserExceptionVector.literal) + _UserExceptionVector_literal_end = ABSOLUTE(.); + } >vector_user_lit :vector_user_lit_phdr + + .UserExceptionVector.text : ALIGN(4) + { + _UserExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.UserExceptionVector.text)) + _UserExceptionVector_text_end = ABSOLUTE(.); + } >vector_user_text :vector_user_text_phdr + + .DoubleExceptionVector.literal : ALIGN(4) + { + _DoubleExceptionVector_literal_start = ABSOLUTE(.); + *(.DoubleExceptionVector.literal) + _DoubleExceptionVector_literal_end = ABSOLUTE(.); + } >vector_double_lit :vector_double_lit_phdr + + .DoubleExceptionVector.text : ALIGN(4) + { + _DoubleExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.DoubleExceptionVector.text)) + _DoubleExceptionVector_text_end = ABSOLUTE(.); + } >vector_double_text :vector_double_text_phdr + + .text : ALIGN(4) + { + _stext = .; + _text_start = ABSOLUTE(.); + *(.entry.text) + *(.init.literal) + KEEP(*(.init)) + *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*) + *(.fini.literal) + KEEP(*(.fini)) + *(.gnu.version) + _text_end = ABSOLUTE(.); + _etext = .; + } >reef_text_start :reef_text_start_phdr + + .reset.rodata : ALIGN(4) + { + _reset_rodata_start = ABSOLUTE(.); + *(.reset.rodata) + _reset_rodata_end = ABSOLUTE(.); + } >reef_data_ro :reef_data_ro_phdr + + .rodata : ALIGN(4) + { + _rodata_start = ABSOLUTE(.); + *(.rodata) + *(.rodata.*) + *(.gnu.linkonce.r.*) + *(.rodata1) + __XT_EXCEPTION_TABLE__ = ABSOLUTE(.); + KEEP (*(.xt_except_table)) + KEEP (*(.gcc_except_table)) + *(.gnu.linkonce.e.*) + *(.gnu.version_r) + KEEP (*(.eh_frame)) + /* C++ constructor and destructor tables, properly ordered: */ + KEEP (*crtbegin.o(.ctors)) + KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + KEEP (*crtbegin.o(.dtors)) + KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + /* C++ exception handlers table: */ + __XT_EXCEPTION_DESCS__ = ABSOLUTE(.); + *(.xt_except_desc) + *(.gnu.linkonce.h.*) + __XT_EXCEPTION_DESCS_END__ = ABSOLUTE(.); + *(.xt_except_desc_end) + *(.dynamic) + *(.gnu.version_d) + . = ALIGN(4); /* this table MUST be 4-byte aligned */ + _bss_table_start = ABSOLUTE(.); + LONG(_bss_start) + LONG(_bss_end) + _bss_table_end = ABSOLUTE(.); + _rodata_end = ABSOLUTE(.); + } >reef_data :reef_data_phdr + + .data : ALIGN(4) + { + _data_start = ABSOLUTE(.); + *(.data) + *(.data.*) + *(.gnu.linkonce.d.*) + KEEP(*(.gnu.linkonce.d.*personality*)) + *(.data1) + *(.sdata) + *(.sdata.*) + *(.gnu.linkonce.s.*) + *(.sdata2) + *(.sdata2.*) + *(.gnu.linkonce.s2.*) + KEEP(*(.jcr)) + _data_end = ABSOLUTE(.); + } >reef_data :reef_data_phdr + + .lit4 : ALIGN(4) + { + _lit4_start = ABSOLUTE(.); + *(*.lit4) + *(.lit4.*) + *(.gnu.linkonce.lit4.*) + _lit4_end = ABSOLUTE(.); + } >reef_data :reef_data_phdr + + .bss (NOLOAD) : ALIGN(8) + { + . = ALIGN (8); + _bss_start = ABSOLUTE(.); + *(.dynsbss) + *(.sbss) + *(.sbss.*) + *(.gnu.linkonce.sb.*) + *(.scommon) + *(.sbss2) + *(.sbss2.*) + *(.gnu.linkonce.sb2.*) + *(.dynbss) + *(.bss) + *(.bss.*) + *(.gnu.linkonce.b.*) + *(COMMON) + . = ALIGN (8); + _bss_end = ABSOLUTE(.); + } >reef_data :reef_data_bss_phdr + + /* stack */ + _end = REEF_STACK_END; + PROVIDE(end = REEF_STACK_END); + _stack_sentry = REEF_STACK_END; + __stack = REEF_STACK_BASE; + + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + .debug_info 0 : { *(.debug_info) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } + + .xt.insn 0 : + { + KEEP (*(.xt.insn)) + KEEP (*(.gnu.linkonce.x.*)) + } + .xt.prop 0 : + { + KEEP (*(.xt.prop)) + KEEP (*(.xt.prop.*)) + KEEP (*(.gnu.linkonce.prop.*)) + } + .xt.lit 0 : + { + KEEP (*(.xt.lit)) + KEEP (*(.xt.lit.*)) + KEEP (*(.gnu.linkonce.p.*)) + } + .xt.profile_range 0 : + { + KEEP (*(.xt.profile_range)) + KEEP (*(.gnu.linkonce.profile_range.*)) + } + .xt.profile_ranges 0 : + { + KEEP (*(.xt.profile_ranges)) + KEEP (*(.gnu.linkonce.xt.profile_ranges.*)) + } + .xt.profile_files 0 : + { + KEEP (*(.xt.profile_files)) + KEEP (*(.gnu.linkonce.xt.profile_files.*)) + } + + .system_heap (NOLOAD) : ALIGN(8) + { + . = ALIGN (32); + _system_heap_start = ABSOLUTE(.); + . = . + HEAP_SYSTEM_SIZE; + _system_heap_end = ABSOLUTE(.); + } >system_heap :system_heap_phdr + + .runtime_heap (NOLOAD) : ALIGN(8) + { + . = ALIGN (32); + _runtime_heap_start = ABSOLUTE(.); + . = . + HEAP_RUNTIME_SIZE; + _runtime_heap_end = ABSOLUTE(.); + } >runtime_heap :runtime_heap_phdr + + .buffer_heap (NOLOAD) : ALIGN(8) + { + . = ALIGN (32); + _system_heap_start = ABSOLUTE(.); + . = . + HEAP_BUFFER_SIZE; + _system_heap_end = ABSOLUTE(.); + } >buffer_heap :buffer_heap_phdr + + .reef_stack (NOLOAD) : ALIGN(8) + { + . = ALIGN (4096); + _reef_stack_start = ABSOLUTE(.); + . = . + REEF_STACK_SIZE; + _reef_stack_end = ABSOLUTE(.); + } >reef_stack :reef_stack_phdr +} +

Previous attempts left file in DOS mode

Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com --- src/platform/haswell/broadwell.x.in | 1016 +++++++++++++++++------------------ 1 file changed, 508 insertions(+), 508 deletions(-)

diff --git a/src/platform/haswell/broadwell.x.in b/src/platform/haswell/broadwell.x.in index 9477773..bec408d 100755 --- a/src/platform/haswell/broadwell.x.in +++ b/src/platform/haswell/broadwell.x.in @@ -1,508 +1,508 @@ -/* - * Linker Script for Broadwell. - * - * This script is run through the GNU C preprocessor to align the memory - * offsets with headers. - * - * Use spaces for formatting as cpp ignore tab sizes. - */ - -#include <platform/memory.h> -#include <xtensa/config/core-isa.h> - -OUTPUT_ARCH(xtensa) - -MEMORY -{ - vector_reset_text : - org = XCHAL_RESET_VECTOR0_PADDR, - len = REEF_MEM_RESET_TEXT_SIZE - vector_reset_lit : - org = XCHAL_RESET_VECTOR0_PADDR + REEF_MEM_RESET_TEXT_SIZE, - len = REEF_MEM_RESET_LIT_SIZE - vector_base_text : - org = XCHAL_VECBASE_RESET_PADDR, - len = REEF_MEM_VECBASE_LIT_SIZE - vector_int2_lit : - org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int2_text : - org = XCHAL_INTLEVEL2_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int3_lit : - org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int3_text : - org = XCHAL_INTLEVEL3_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int4_lit : - org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int4_text : - org = XCHAL_INTLEVEL4_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int5_lit : - org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int5_text : - org = XCHAL_INTLEVEL5_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int6_lit : - org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int6_text : - org = XCHAL_INTLEVEL6_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int7_lit : - org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int7_text : - org = XCHAL_INTLEVEL7_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_kernel_lit : - org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_kernel_text : - org = XCHAL_KERNEL_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_user_lit : - org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_user_text : - org = XCHAL_USER_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_double_lit : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_double_text : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - reef_text_start : - org = XCHAL_NMI_VECTOR_VADDR + REEF_MEM_VECT_SIZE, - len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_NMI_VECTOR_VADDR + REEF_MEM_VECT_SIZE) - reef_data_ro : - org = DRAM0_BASE, - len = REEF_MEM_RO_SIZE - reef_data : - org = DRAM0_BASE + REEF_MEM_RO_SIZE, - len = HEAP_SYSTEM_BASE - (DRAM0_BASE + REEF_MEM_RO_SIZE) - system_heap : - org = HEAP_SYSTEM_BASE, - len = HEAP_SYSTEM_SIZE - runtime_heap : - org = HEAP_RUNTIME_BASE, - len = HEAP_RUNTIME_SIZE - buffer_heap : - org = HEAP_BUFFER_BASE, - len = HEAP_BUFFER_SIZE - reef_stack : - org = REEF_STACK_END, - len = REEF_STACK_BASE - REEF_STACK_END -} - -PHDRS -{ - vector_reset_text_phdr PT_LOAD; - vector_reset_lit_phdr PT_LOAD; - vector_base_text_phdr PT_LOAD; - vector_base_lit_phdr PT_LOAD; - vector_int2_text_phdr PT_LOAD; - vector_int2_lit_phdr PT_LOAD; - vector_int3_text_phdr PT_LOAD; - vector_int3_lit_phdr PT_LOAD; - vector_int4_text_phdr PT_LOAD; - vector_int4_lit_phdr PT_LOAD; - vector_int5_text_phdr PT_LOAD; - vector_int5_lit_phdr PT_LOAD; - vector_int6_text_phdr PT_LOAD; - vector_int6_lit_phdr PT_LOAD; - vector_int7_text_phdr PT_LOAD; - vector_int7_lit_phdr PT_LOAD; - vector_kernel_text_phdr PT_LOAD; - vector_kernel_lit_phdr PT_LOAD; - vector_user_text_phdr PT_LOAD; - vector_user_lit_phdr PT_LOAD; - vector_double_text_phdr PT_LOAD; - vector_double_lit_phdr PT_LOAD; - reef_text_start_phdr PT_LOAD; - reef_data_ro_phdr PT_LOAD; - reef_data_phdr PT_LOAD; - reef_data_bss_phdr PT_LOAD; - system_heap_phdr PT_LOAD; - runtime_heap_phdr PT_LOAD; - buffer_heap_phdr PT_LOAD; - reef_stack_phdr PT_LOAD; -} - -/* Default entry point: */ -ENTRY(_ResetVector) -_rom_store_table = 0; - -/* ABI0 does not use Window base */ -PROVIDE(_memmap_vecbase_reset = XCHAL_VECBASE_RESET_PADDR); - -/* Various memory-map dependent cache attribute settings: */ -_memmap_cacheattr_wb_base = 0x44024000; -_memmap_cacheattr_wt_base = 0x11021000; -_memmap_cacheattr_bp_base = 0x22022000; -_memmap_cacheattr_unused_mask = 0x00F00FFF; -_memmap_cacheattr_wb_trapnull = 0x4422422F; -_memmap_cacheattr_wba_trapnull = 0x4422422F; -_memmap_cacheattr_wbna_trapnull = 0x25222222; -_memmap_cacheattr_wt_trapnull = 0x1122122F; -_memmap_cacheattr_bp_trapnull = 0x2222222F; -_memmap_cacheattr_wb_strict = 0x44F24FFF; -_memmap_cacheattr_wt_strict = 0x11F21FFF; -_memmap_cacheattr_bp_strict = 0x22F22FFF; -_memmap_cacheattr_wb_allvalid = 0x44224222; -_memmap_cacheattr_wt_allvalid = 0x11221222; -_memmap_cacheattr_bp_allvalid = 0x22222222; -PROVIDE(_memmap_cacheattr_reset = _memmap_cacheattr_wbna_trapnull); - -SECTIONS -{ - .ResetVector.text : ALIGN(4) - { - _ResetVector_text_start = ABSOLUTE(.); - KEEP (*(.ResetVector.text)) - _ResetVector_text_end = ABSOLUTE(.); - } >vector_reset_text :vector_reset_text_phdr - - .ResetVector.literal : ALIGN(4) - { - _ResetVector_literal_start = ABSOLUTE(.); - *(.ResetVector.literal) - _ResetVector_literal_end = ABSOLUTE(.); - } >vector_reset_lit :vector_reset_lit_phdr - - .WindowVectors.text : ALIGN(4) - { - _WindowVectors_text_start = ABSOLUTE(.); - KEEP (*(.WindowVectors.text)) - _WindowVectors_text_end = ABSOLUTE(.); - } >vector_base_text :vector_base_text_phdr - - .Level2InterruptVector.literal : ALIGN(4) - { - _Level2InterruptVector_literal_start = ABSOLUTE(.); - *(.Level2InterruptVector.literal) - _Level2InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int2_lit :vector_int2_lit_phdr - - .Level2InterruptVector.text : ALIGN(4) - { - _Level2InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level2InterruptVector.text)) - _Level2InterruptVector_text_end = ABSOLUTE(.); - } >vector_int2_text :vector_int2_text_phdr - - .Level3InterruptVector.literal : ALIGN(4) - { - _Level3InterruptVector_literal_start = ABSOLUTE(.); - *(.Level3InterruptVector.literal) - _Level3InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int3_lit :vector_int3_lit_phdr - - .Level3InterruptVector.text : ALIGN(4) - { - _Level3InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level3InterruptVector.text)) - _Level3InterruptVector_text_end = ABSOLUTE(.); - } >vector_int3_text :vector_int3_text_phdr - - .Level4InterruptVector.literal : ALIGN(4) - { - _Level4InterruptVector_literal_start = ABSOLUTE(.); - *(.Level4InterruptVector.literal) - _Level4InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int4_lit :vector_int4_lit_phdr - - .Level4InterruptVector.text : ALIGN(4) - { - _Level4InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level4InterruptVector.text)) - _Level4InterruptVector_text_end = ABSOLUTE(.); - } >vector_int4_text :vector_int4_text_phdr - - .Level5InterruptVector.literal : ALIGN(4) - { - _Level5InterruptVector_literal_start = ABSOLUTE(.); - *(.Level5InterruptVector.literal) - _Level5InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int5_lit :vector_int5_lit_phdr - - .Level5InterruptVector.text : ALIGN(4) - { - _Level5InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level5InterruptVector.text)) - _Level5InterruptVector_text_end = ABSOLUTE(.); - } >vector_int5_text :vector_int5_text_phdr - - .DebugExceptionVector.literal : ALIGN(4) - { - _DebugExceptionVector_literal_start = ABSOLUTE(.); - *(.DebugExceptionVector.literal) - _DebugExceptionVector_literal_end = ABSOLUTE(.); - } >vector_int6_lit :vector_int6_lit_phdr - - .DebugExceptionVector.text : ALIGN(4) - { - _DebugExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.DebugExceptionVector.text)) - _DebugExceptionVector_text_end = ABSOLUTE(.); - } >vector_int6_text :vector_int6_text_phdr - - .NMIExceptionVector.literal : ALIGN(4) - { - _NMIExceptionVector_literal_start = ABSOLUTE(.); - *(.NMIExceptionVector.literal) - _NMIExceptionVector_literal_end = ABSOLUTE(.); - } >vector_int7_lit :vector_int7_lit_phdr - - .NMIExceptionVector.text : ALIGN(4) - { - _NMIExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.NMIExceptionVector.text)) - _NMIExceptionVector_text_end = ABSOLUTE(.); - } >vector_int7_text :vector_int7_text_phdr - - .KernelExceptionVector.literal : ALIGN(4) - { - _KernelExceptionVector_literal_start = ABSOLUTE(.); - *(.KernelExceptionVector.literal) - _KernelExceptionVector_literal_end = ABSOLUTE(.); - } >vector_kernel_lit :vector_kernel_lit_phdr - - .KernelExceptionVector.text : ALIGN(4) - { - _KernelExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.KernelExceptionVector.text)) - _KernelExceptionVector_text_end = ABSOLUTE(.); - } >vector_kernel_text :vector_kernel_text_phdr - - .UserExceptionVector.literal : ALIGN(4) - { - _UserExceptionVector_literal_start = ABSOLUTE(.); - *(.UserExceptionVector.literal) - _UserExceptionVector_literal_end = ABSOLUTE(.); - } >vector_user_lit :vector_user_lit_phdr - - .UserExceptionVector.text : ALIGN(4) - { - _UserExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.UserExceptionVector.text)) - _UserExceptionVector_text_end = ABSOLUTE(.); - } >vector_user_text :vector_user_text_phdr - - .DoubleExceptionVector.literal : ALIGN(4) - { - _DoubleExceptionVector_literal_start = ABSOLUTE(.); - *(.DoubleExceptionVector.literal) - _DoubleExceptionVector_literal_end = ABSOLUTE(.); - } >vector_double_lit :vector_double_lit_phdr - - .DoubleExceptionVector.text : ALIGN(4) - { - _DoubleExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.DoubleExceptionVector.text)) - _DoubleExceptionVector_text_end = ABSOLUTE(.); - } >vector_double_text :vector_double_text_phdr - - .text : ALIGN(4) - { - _stext = .; - _text_start = ABSOLUTE(.); - *(.entry.text) - *(.init.literal) - KEEP(*(.init)) - *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*) - *(.fini.literal) - KEEP(*(.fini)) - *(.gnu.version) - _text_end = ABSOLUTE(.); - _etext = .; - } >reef_text_start :reef_text_start_phdr - - .reset.rodata : ALIGN(4) - { - _reset_rodata_start = ABSOLUTE(.); - *(.reset.rodata) - _reset_rodata_end = ABSOLUTE(.); - } >reef_data_ro :reef_data_ro_phdr - - .rodata : ALIGN(4) - { - _rodata_start = ABSOLUTE(.); - *(.rodata) - *(.rodata.*) - *(.gnu.linkonce.r.*) - *(.rodata1) - __XT_EXCEPTION_TABLE__ = ABSOLUTE(.); - KEEP (*(.xt_except_table)) - KEEP (*(.gcc_except_table)) - *(.gnu.linkonce.e.*) - *(.gnu.version_r) - KEEP (*(.eh_frame)) - /* C++ constructor and destructor tables, properly ordered: */ - KEEP (*crtbegin.o(.ctors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - KEEP (*crtbegin.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - /* C++ exception handlers table: */ - __XT_EXCEPTION_DESCS__ = ABSOLUTE(.); - *(.xt_except_desc) - *(.gnu.linkonce.h.*) - __XT_EXCEPTION_DESCS_END__ = ABSOLUTE(.); - *(.xt_except_desc_end) - *(.dynamic) - *(.gnu.version_d) - . = ALIGN(4); /* this table MUST be 4-byte aligned */ - _bss_table_start = ABSOLUTE(.); - LONG(_bss_start) - LONG(_bss_end) - _bss_table_end = ABSOLUTE(.); - _rodata_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr - - .data : ALIGN(4) - { - _data_start = ABSOLUTE(.); - *(.data) - *(.data.*) - *(.gnu.linkonce.d.*) - KEEP(*(.gnu.linkonce.d.*personality*)) - *(.data1) - *(.sdata) - *(.sdata.*) - *(.gnu.linkonce.s.*) - *(.sdata2) - *(.sdata2.*) - *(.gnu.linkonce.s2.*) - KEEP(*(.jcr)) - _data_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr - - .lit4 : ALIGN(4) - { - _lit4_start = ABSOLUTE(.); - *(*.lit4) - *(.lit4.*) - *(.gnu.linkonce.lit4.*) - _lit4_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr - - .bss (NOLOAD) : ALIGN(8) - { - . = ALIGN (8); - _bss_start = ABSOLUTE(.); - *(.dynsbss) - *(.sbss) - *(.sbss.*) - *(.gnu.linkonce.sb.*) - *(.scommon) - *(.sbss2) - *(.sbss2.*) - *(.gnu.linkonce.sb2.*) - *(.dynbss) - *(.bss) - *(.bss.*) - *(.gnu.linkonce.b.*) - *(COMMON) - . = ALIGN (8); - _bss_end = ABSOLUTE(.); - } >reef_data :reef_data_bss_phdr - - /* stack */ - _end = REEF_STACK_END; - PROVIDE(end = REEF_STACK_END); - _stack_sentry = REEF_STACK_END; - __stack = REEF_STACK_BASE; - - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - - .xt.insn 0 : - { - KEEP (*(.xt.insn)) - KEEP (*(.gnu.linkonce.x.*)) - } - .xt.prop 0 : - { - KEEP (*(.xt.prop)) - KEEP (*(.xt.prop.*)) - KEEP (*(.gnu.linkonce.prop.*)) - } - .xt.lit 0 : - { - KEEP (*(.xt.lit)) - KEEP (*(.xt.lit.*)) - KEEP (*(.gnu.linkonce.p.*)) - } - .xt.profile_range 0 : - { - KEEP (*(.xt.profile_range)) - KEEP (*(.gnu.linkonce.profile_range.*)) - } - .xt.profile_ranges 0 : - { - KEEP (*(.xt.profile_ranges)) - KEEP (*(.gnu.linkonce.xt.profile_ranges.*)) - } - .xt.profile_files 0 : - { - KEEP (*(.xt.profile_files)) - KEEP (*(.gnu.linkonce.xt.profile_files.*)) - } - - .system_heap (NOLOAD) : ALIGN(8) - { - . = ALIGN (32); - _system_heap_start = ABSOLUTE(.); - . = . + HEAP_SYSTEM_SIZE; - _system_heap_end = ABSOLUTE(.); - } >system_heap :system_heap_phdr - - .runtime_heap (NOLOAD) : ALIGN(8) - { - . = ALIGN (32); - _runtime_heap_start = ABSOLUTE(.); - . = . + HEAP_RUNTIME_SIZE; - _runtime_heap_end = ABSOLUTE(.); - } >runtime_heap :runtime_heap_phdr - - .buffer_heap (NOLOAD) : ALIGN(8) - { - . = ALIGN (32); - _system_heap_start = ABSOLUTE(.); - . = . + HEAP_BUFFER_SIZE; - _system_heap_end = ABSOLUTE(.); - } >buffer_heap :buffer_heap_phdr - - .reef_stack (NOLOAD) : ALIGN(8) - { - . = ALIGN (4096); - _reef_stack_start = ABSOLUTE(.); - . = . + REEF_STACK_SIZE; - _reef_stack_end = ABSOLUTE(.); - } >reef_stack :reef_stack_phdr -} - +/* + * Linker Script for Broadwell. + * + * This script is run through the GNU C preprocessor to align the memory + * offsets with headers. + * + * Use spaces for formatting as cpp ignore tab sizes. + */ + +#include <platform/memory.h> +#include <xtensa/config/core-isa.h> + +OUTPUT_ARCH(xtensa) + +MEMORY +{ + vector_reset_text : + org = XCHAL_RESET_VECTOR0_PADDR, + len = REEF_MEM_RESET_TEXT_SIZE + vector_reset_lit : + org = XCHAL_RESET_VECTOR0_PADDR + REEF_MEM_RESET_TEXT_SIZE, + len = REEF_MEM_RESET_LIT_SIZE + vector_base_text : + org = XCHAL_VECBASE_RESET_PADDR, + len = REEF_MEM_VECBASE_LIT_SIZE + vector_int2_lit : + org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int2_text : + org = XCHAL_INTLEVEL2_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int3_lit : + org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int3_text : + org = XCHAL_INTLEVEL3_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int4_lit : + org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int4_text : + org = XCHAL_INTLEVEL4_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int5_lit : + org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int5_text : + org = XCHAL_INTLEVEL5_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int6_lit : + org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int6_text : + org = XCHAL_INTLEVEL6_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int7_lit : + org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int7_text : + org = XCHAL_INTLEVEL7_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_kernel_lit : + org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_kernel_text : + org = XCHAL_KERNEL_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_user_lit : + org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_user_text : + org = XCHAL_USER_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_double_lit : + org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_double_text : + org = XCHAL_DOUBLEEXC_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + reef_text_start : + org = XCHAL_NMI_VECTOR_VADDR + REEF_MEM_VECT_SIZE, + len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_NMI_VECTOR_VADDR + REEF_MEM_VECT_SIZE) + reef_data_ro : + org = DRAM0_BASE, + len = REEF_MEM_RO_SIZE + reef_data : + org = DRAM0_BASE + REEF_MEM_RO_SIZE, + len = HEAP_SYSTEM_BASE - (DRAM0_BASE + REEF_MEM_RO_SIZE) + system_heap : + org = HEAP_SYSTEM_BASE, + len = HEAP_SYSTEM_SIZE + runtime_heap : + org = HEAP_RUNTIME_BASE, + len = HEAP_RUNTIME_SIZE + buffer_heap : + org = HEAP_BUFFER_BASE, + len = HEAP_BUFFER_SIZE + reef_stack : + org = REEF_STACK_END, + len = REEF_STACK_BASE - REEF_STACK_END +} + +PHDRS +{ + vector_reset_text_phdr PT_LOAD; + vector_reset_lit_phdr PT_LOAD; + vector_base_text_phdr PT_LOAD; + vector_base_lit_phdr PT_LOAD; + vector_int2_text_phdr PT_LOAD; + vector_int2_lit_phdr PT_LOAD; + vector_int3_text_phdr PT_LOAD; + vector_int3_lit_phdr PT_LOAD; + vector_int4_text_phdr PT_LOAD; + vector_int4_lit_phdr PT_LOAD; + vector_int5_text_phdr PT_LOAD; + vector_int5_lit_phdr PT_LOAD; + vector_int6_text_phdr PT_LOAD; + vector_int6_lit_phdr PT_LOAD; + vector_int7_text_phdr PT_LOAD; + vector_int7_lit_phdr PT_LOAD; + vector_kernel_text_phdr PT_LOAD; + vector_kernel_lit_phdr PT_LOAD; + vector_user_text_phdr PT_LOAD; + vector_user_lit_phdr PT_LOAD; + vector_double_text_phdr PT_LOAD; + vector_double_lit_phdr PT_LOAD; + reef_text_start_phdr PT_LOAD; + reef_data_ro_phdr PT_LOAD; + reef_data_phdr PT_LOAD; + reef_data_bss_phdr PT_LOAD; + system_heap_phdr PT_LOAD; + runtime_heap_phdr PT_LOAD; + buffer_heap_phdr PT_LOAD; + reef_stack_phdr PT_LOAD; +} + +/* Default entry point: */ +ENTRY(_ResetVector) +_rom_store_table = 0; + +/* ABI0 does not use Window base */ +PROVIDE(_memmap_vecbase_reset = XCHAL_VECBASE_RESET_PADDR); + +/* Various memory-map dependent cache attribute settings: */ +_memmap_cacheattr_wb_base = 0x44024000; +_memmap_cacheattr_wt_base = 0x11021000; +_memmap_cacheattr_bp_base = 0x22022000; +_memmap_cacheattr_unused_mask = 0x00F00FFF; +_memmap_cacheattr_wb_trapnull = 0x4422422F; +_memmap_cacheattr_wba_trapnull = 0x4422422F; +_memmap_cacheattr_wbna_trapnull = 0x25222222; +_memmap_cacheattr_wt_trapnull = 0x1122122F; +_memmap_cacheattr_bp_trapnull = 0x2222222F; +_memmap_cacheattr_wb_strict = 0x44F24FFF; +_memmap_cacheattr_wt_strict = 0x11F21FFF; +_memmap_cacheattr_bp_strict = 0x22F22FFF; +_memmap_cacheattr_wb_allvalid = 0x44224222; +_memmap_cacheattr_wt_allvalid = 0x11221222; +_memmap_cacheattr_bp_allvalid = 0x22222222; +PROVIDE(_memmap_cacheattr_reset = _memmap_cacheattr_wbna_trapnull); + +SECTIONS +{ + .ResetVector.text : ALIGN(4) + { + _ResetVector_text_start = ABSOLUTE(.); + KEEP (*(.ResetVector.text)) + _ResetVector_text_end = ABSOLUTE(.); + } >vector_reset_text :vector_reset_text_phdr + + .ResetVector.literal : ALIGN(4) + { + _ResetVector_literal_start = ABSOLUTE(.); + *(.ResetVector.literal) + _ResetVector_literal_end = ABSOLUTE(.); + } >vector_reset_lit :vector_reset_lit_phdr + + .WindowVectors.text : ALIGN(4) + { + _WindowVectors_text_start = ABSOLUTE(.); + KEEP (*(.WindowVectors.text)) + _WindowVectors_text_end = ABSOLUTE(.); + } >vector_base_text :vector_base_text_phdr + + .Level2InterruptVector.literal : ALIGN(4) + { + _Level2InterruptVector_literal_start = ABSOLUTE(.); + *(.Level2InterruptVector.literal) + _Level2InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int2_lit :vector_int2_lit_phdr + + .Level2InterruptVector.text : ALIGN(4) + { + _Level2InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level2InterruptVector.text)) + _Level2InterruptVector_text_end = ABSOLUTE(.); + } >vector_int2_text :vector_int2_text_phdr + + .Level3InterruptVector.literal : ALIGN(4) + { + _Level3InterruptVector_literal_start = ABSOLUTE(.); + *(.Level3InterruptVector.literal) + _Level3InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int3_lit :vector_int3_lit_phdr + + .Level3InterruptVector.text : ALIGN(4) + { + _Level3InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level3InterruptVector.text)) + _Level3InterruptVector_text_end = ABSOLUTE(.); + } >vector_int3_text :vector_int3_text_phdr + + .Level4InterruptVector.literal : ALIGN(4) + { + _Level4InterruptVector_literal_start = ABSOLUTE(.); + *(.Level4InterruptVector.literal) + _Level4InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int4_lit :vector_int4_lit_phdr + + .Level4InterruptVector.text : ALIGN(4) + { + _Level4InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level4InterruptVector.text)) + _Level4InterruptVector_text_end = ABSOLUTE(.); + } >vector_int4_text :vector_int4_text_phdr + + .Level5InterruptVector.literal : ALIGN(4) + { + _Level5InterruptVector_literal_start = ABSOLUTE(.); + *(.Level5InterruptVector.literal) + _Level5InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int5_lit :vector_int5_lit_phdr + + .Level5InterruptVector.text : ALIGN(4) + { + _Level5InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level5InterruptVector.text)) + _Level5InterruptVector_text_end = ABSOLUTE(.); + } >vector_int5_text :vector_int5_text_phdr + + .DebugExceptionVector.literal : ALIGN(4) + { + _DebugExceptionVector_literal_start = ABSOLUTE(.); + *(.DebugExceptionVector.literal) + _DebugExceptionVector_literal_end = ABSOLUTE(.); + } >vector_int6_lit :vector_int6_lit_phdr + + .DebugExceptionVector.text : ALIGN(4) + { + _DebugExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.DebugExceptionVector.text)) + _DebugExceptionVector_text_end = ABSOLUTE(.); + } >vector_int6_text :vector_int6_text_phdr + + .NMIExceptionVector.literal : ALIGN(4) + { + _NMIExceptionVector_literal_start = ABSOLUTE(.); + *(.NMIExceptionVector.literal) + _NMIExceptionVector_literal_end = ABSOLUTE(.); + } >vector_int7_lit :vector_int7_lit_phdr + + .NMIExceptionVector.text : ALIGN(4) + { + _NMIExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.NMIExceptionVector.text)) + _NMIExceptionVector_text_end = ABSOLUTE(.); + } >vector_int7_text :vector_int7_text_phdr + + .KernelExceptionVector.literal : ALIGN(4) + { + _KernelExceptionVector_literal_start = ABSOLUTE(.); + *(.KernelExceptionVector.literal) + _KernelExceptionVector_literal_end = ABSOLUTE(.); + } >vector_kernel_lit :vector_kernel_lit_phdr + + .KernelExceptionVector.text : ALIGN(4) + { + _KernelExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.KernelExceptionVector.text)) + _KernelExceptionVector_text_end = ABSOLUTE(.); + } >vector_kernel_text :vector_kernel_text_phdr + + .UserExceptionVector.literal : ALIGN(4) + { + _UserExceptionVector_literal_start = ABSOLUTE(.); + *(.UserExceptionVector.literal) + _UserExceptionVector_literal_end = ABSOLUTE(.); + } >vector_user_lit :vector_user_lit_phdr + + .UserExceptionVector.text : ALIGN(4) + { + _UserExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.UserExceptionVector.text)) + _UserExceptionVector_text_end = ABSOLUTE(.); + } >vector_user_text :vector_user_text_phdr + + .DoubleExceptionVector.literal : ALIGN(4) + { + _DoubleExceptionVector_literal_start = ABSOLUTE(.); + *(.DoubleExceptionVector.literal) + _DoubleExceptionVector_literal_end = ABSOLUTE(.); + } >vector_double_lit :vector_double_lit_phdr + + .DoubleExceptionVector.text : ALIGN(4) + { + _DoubleExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.DoubleExceptionVector.text)) + _DoubleExceptionVector_text_end = ABSOLUTE(.); + } >vector_double_text :vector_double_text_phdr + + .text : ALIGN(4) + { + _stext = .; + _text_start = ABSOLUTE(.); + *(.entry.text) + *(.init.literal) + KEEP(*(.init)) + *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*) + *(.fini.literal) + KEEP(*(.fini)) + *(.gnu.version) + _text_end = ABSOLUTE(.); + _etext = .; + } >reef_text_start :reef_text_start_phdr + + .reset.rodata : ALIGN(4) + { + _reset_rodata_start = ABSOLUTE(.); + *(.reset.rodata) + _reset_rodata_end = ABSOLUTE(.); + } >reef_data_ro :reef_data_ro_phdr + + .rodata : ALIGN(4) + { + _rodata_start = ABSOLUTE(.); + *(.rodata) + *(.rodata.*) + *(.gnu.linkonce.r.*) + *(.rodata1) + __XT_EXCEPTION_TABLE__ = ABSOLUTE(.); + KEEP (*(.xt_except_table)) + KEEP (*(.gcc_except_table)) + *(.gnu.linkonce.e.*) + *(.gnu.version_r) + KEEP (*(.eh_frame)) + /* C++ constructor and destructor tables, properly ordered: */ + KEEP (*crtbegin.o(.ctors)) + KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + KEEP (*crtbegin.o(.dtors)) + KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + /* C++ exception handlers table: */ + __XT_EXCEPTION_DESCS__ = ABSOLUTE(.); + *(.xt_except_desc) + *(.gnu.linkonce.h.*) + __XT_EXCEPTION_DESCS_END__ = ABSOLUTE(.); + *(.xt_except_desc_end) + *(.dynamic) + *(.gnu.version_d) + . = ALIGN(4); /* this table MUST be 4-byte aligned */ + _bss_table_start = ABSOLUTE(.); + LONG(_bss_start) + LONG(_bss_end) + _bss_table_end = ABSOLUTE(.); + _rodata_end = ABSOLUTE(.); + } >reef_data :reef_data_phdr + + .data : ALIGN(4) + { + _data_start = ABSOLUTE(.); + *(.data) + *(.data.*) + *(.gnu.linkonce.d.*) + KEEP(*(.gnu.linkonce.d.*personality*)) + *(.data1) + *(.sdata) + *(.sdata.*) + *(.gnu.linkonce.s.*) + *(.sdata2) + *(.sdata2.*) + *(.gnu.linkonce.s2.*) + KEEP(*(.jcr)) + _data_end = ABSOLUTE(.); + } >reef_data :reef_data_phdr + + .lit4 : ALIGN(4) + { + _lit4_start = ABSOLUTE(.); + *(*.lit4) + *(.lit4.*) + *(.gnu.linkonce.lit4.*) + _lit4_end = ABSOLUTE(.); + } >reef_data :reef_data_phdr + + .bss (NOLOAD) : ALIGN(8) + { + . = ALIGN (8); + _bss_start = ABSOLUTE(.); + *(.dynsbss) + *(.sbss) + *(.sbss.*) + *(.gnu.linkonce.sb.*) + *(.scommon) + *(.sbss2) + *(.sbss2.*) + *(.gnu.linkonce.sb2.*) + *(.dynbss) + *(.bss) + *(.bss.*) + *(.gnu.linkonce.b.*) + *(COMMON) + . = ALIGN (8); + _bss_end = ABSOLUTE(.); + } >reef_data :reef_data_bss_phdr + + /* stack */ + _end = REEF_STACK_END; + PROVIDE(end = REEF_STACK_END); + _stack_sentry = REEF_STACK_END; + __stack = REEF_STACK_BASE; + + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + .debug_info 0 : { *(.debug_info) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } + + .xt.insn 0 : + { + KEEP (*(.xt.insn)) + KEEP (*(.gnu.linkonce.x.*)) + } + .xt.prop 0 : + { + KEEP (*(.xt.prop)) + KEEP (*(.xt.prop.*)) + KEEP (*(.gnu.linkonce.prop.*)) + } + .xt.lit 0 : + { + KEEP (*(.xt.lit)) + KEEP (*(.xt.lit.*)) + KEEP (*(.gnu.linkonce.p.*)) + } + .xt.profile_range 0 : + { + KEEP (*(.xt.profile_range)) + KEEP (*(.gnu.linkonce.profile_range.*)) + } + .xt.profile_ranges 0 : + { + KEEP (*(.xt.profile_ranges)) + KEEP (*(.gnu.linkonce.xt.profile_ranges.*)) + } + .xt.profile_files 0 : + { + KEEP (*(.xt.profile_files)) + KEEP (*(.gnu.linkonce.xt.profile_files.*)) + } + + .system_heap (NOLOAD) : ALIGN(8) + { + . = ALIGN (32); + _system_heap_start = ABSOLUTE(.); + . = . + HEAP_SYSTEM_SIZE; + _system_heap_end = ABSOLUTE(.); + } >system_heap :system_heap_phdr + + .runtime_heap (NOLOAD) : ALIGN(8) + { + . = ALIGN (32); + _runtime_heap_start = ABSOLUTE(.); + . = . + HEAP_RUNTIME_SIZE; + _runtime_heap_end = ABSOLUTE(.); + } >runtime_heap :runtime_heap_phdr + + .buffer_heap (NOLOAD) : ALIGN(8) + { + . = ALIGN (32); + _system_heap_start = ABSOLUTE(.); + . = . + HEAP_BUFFER_SIZE; + _system_heap_end = ABSOLUTE(.); + } >buffer_heap :buffer_heap_phdr + + .reef_stack (NOLOAD) : ALIGN(8) + { + . = ALIGN (4096); + _reef_stack_start = ABSOLUTE(.); + . = . + REEF_STACK_SIZE; + _reef_stack_end = ABSOLUTE(.); + } >reef_stack :reef_stack_phdr +} +

It's crazy to use shifts and masks without parenthesis

Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com --- src/include/reef/interrupt-map.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/include/reef/interrupt-map.h b/src/include/reef/interrupt-map.h index 0f22068..164cec2 100644 --- a/src/include/reef/interrupt-map.h +++ b/src/include/reef/interrupt-map.h @@ -43,10 +43,10 @@ #define REEF_IRQ_CPU_MASK 0xff

#define REEF_IRQ(_bit, _level, _cpu, _number) \ - ((_bit << REEF_IRQ_BIT_SHIFT) \ - | (_level << REEF_IRQ_LEVEL_SHIFT)\ - | (_cpu << REEF_IRQ_CPU_SHIFT)\ - | (_number << REEF_IRQ_NUM_SHIFT)) + (((_bit) << REEF_IRQ_BIT_SHIFT) \ + | ((_level) << REEF_IRQ_LEVEL_SHIFT) \ + | ((_cpu) << REEF_IRQ_CPU_SHIFT) \ + | ((_number) << REEF_IRQ_NUM_SHIFT))

#ifdef CONFIG_IRQ_MAP /* @@ -58,13 +58,13 @@ * 4. CPU interrupt number. */ #define REEF_IRQ_NUMBER(_irq) \ - ((_irq >> REEF_IRQ_NUM_SHIFT) & REEF_IRQ_NUM_MASK) + (((_irq) >> REEF_IRQ_NUM_SHIFT) & REEF_IRQ_NUM_MASK) #define REEF_IRQ_LEVEL(_level) \ - ((_level >> REEF_IRQ_LEVEL_SHIFT) & REEF_IRQ_LEVEL_MASK) + (((_level) >> REEF_IRQ_LEVEL_SHIFT) & REEF_IRQ_LEVEL_MASK) #define REEF_IRQ_BIT(_bit) \ - ((_bit >> REEF_IRQ_BIT_SHIFT) & REEF_IRQ_BIT_MASK) + (((_bit) >> REEF_IRQ_BIT_SHIFT) & REEF_IRQ_BIT_MASK) #define REEF_IRQ_CPU(_cpu) \ - ((_cpu >> REEF_IRQ_CPU_SHIFT) & REEF_IRQ_CPU_MASK) + (((_cpu) >> REEF_IRQ_CPU_SHIFT) & REEF_IRQ_CPU_MASK) #else /* * IRQs are directly mapped onto a single level, bit and level.

Let's remove reef to avoid confusion/legacy. no functionality change but the name of generated files will change so targets and install scripts will need to be updated

There should be only one occurrence of "Reef" left in rimage/file_format.h, left as is for backwards compatibility. This may be changed separately at a later point.

Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com --- .gitignore | 4 +- Makefile.am | 4 +- configure.ac | 22 ++-- src/Makefile.am | 2 +- src/arch/host/include/arch/Makefile.am | 2 +- src/arch/host/include/arch/interrupt.h | 2 +- src/arch/host/include/arch/{reef.h => sof.h} | 4 +- src/arch/xtensa/Makefile.am | 42 +++---- src/arch/xtensa/boot_loader.c | 4 +- src/arch/xtensa/include/arch/Makefile.am | 2 +- src/arch/xtensa/include/arch/interrupt.h | 10 +- src/arch/xtensa/include/arch/{reef.h => sof.h} | 6 +- src/arch/xtensa/include/arch/string.h | 4 +- src/arch/xtensa/init.c | 12 +- src/arch/xtensa/main-entry.S | 2 +- src/arch/xtensa/reset-vector.S | 2 +- src/arch/xtensa/task.c | 8 +- src/arch/xtensa/timer.c | 8 +- src/audio/buffer.c | 20 +-- src/audio/component.c | 14 +-- src/audio/dai.c | 20 +-- src/audio/eq_fir.c | 20 +-- src/audio/eq_iir.c | 20 +-- src/audio/fir.c | 2 +- src/audio/fir.h | 2 +- src/audio/host.c | 22 ++-- src/audio/iir.c | 2 +- src/audio/mixer.c | 10 +- src/audio/mux.c | 8 +- src/audio/pipeline.c | 20 +-- src/audio/pipeline_static.c | 16 +-- src/audio/src.c | 26 ++-- src/audio/src_generic.c | 6 +- src/audio/src_hifi2ep.c | 6 +- src/audio/src_hifi3.c | 6 +- src/audio/switch.c | 8 +- src/audio/tone.c | 22 ++-- src/audio/volume.c | 20 +-- src/drivers/Makefile.am | 2 +- src/drivers/apl-ssp.c | 8 +- src/drivers/byt-ssp.c | 8 +- src/drivers/dw-dma.c | 32 ++--- src/drivers/hda-dma.c | 20 +-- src/include/Makefile.am | 2 +- src/include/{reef => sof}/Makefile.am | 4 +- src/include/{reef => sof}/agent.h | 12 +- src/include/{reef => sof}/alloc.h | 6 +- src/include/{reef => sof}/atomic.h | 0 src/include/{reef => sof}/audio/Makefile.am | 2 +- src/include/{reef => sof}/audio/buffer.h | 14 +-- .../{reef => sof}/audio/coefficients/Makefile.am | 0 .../audio/coefficients/src/Makefile.am | 0 .../src/src_std_int32_10_21_4583_5000.h | 0 .../src/src_std_int32_10_9_4583_5000.h | 0 .../src/src_std_int32_16_7_4125_5000.h | 0 .../coefficients/src/src_std_int32_1_2_2292_5000.h | 0 .../coefficients/src/src_std_int32_1_2_4583_5000.h | 0 .../coefficients/src/src_std_int32_1_3_2292_5000.h | 0 .../coefficients/src/src_std_int32_1_3_4583_5000.h | 0 .../src/src_std_int32_20_21_4211_5000.h | 0 .../src/src_std_int32_20_7_3008_5000.h | 0 .../src/src_std_int32_21_20_4211_5000.h | 0 .../src/src_std_int32_21_40_4010_5000.h | 0 .../src/src_std_int32_21_80_4010_5000.h | 0 .../coefficients/src/src_std_int32_2_1_2292_5000.h | 0 .../coefficients/src/src_std_int32_2_1_4583_5000.h | 0 .../coefficients/src/src_std_int32_2_3_4583_5000.h | 0 .../src/src_std_int32_32_21_4583_5000.h | 0 .../coefficients/src/src_std_int32_3_1_2292_5000.h | 0 .../coefficients/src/src_std_int32_3_1_4583_5000.h | 0 .../coefficients/src/src_std_int32_3_2_4583_5000.h | 0 .../coefficients/src/src_std_int32_3_4_4583_5000.h | 0 .../src/src_std_int32_40_21_4010_5000.h | 0 .../coefficients/src/src_std_int32_4_3_4583_5000.h | 0 .../coefficients/src/src_std_int32_5_7_4583_5000.h | 0 .../coefficients/src/src_std_int32_7_8_4583_5000.h | 0 .../src/src_std_int32_8_21_3274_5000.h | 0 .../coefficients/src/src_std_int32_8_7_2494_5000.h | 0 .../coefficients/src/src_std_int32_8_7_4583_5000.h | 0 .../audio/coefficients/src/src_std_int32_define.h | 0 .../audio/coefficients/src/src_std_int32_table.h | 54 ++++---- .../src/src_tiny_int16_1_2_3281_5000.h | 0 .../src/src_tiny_int16_1_3_1641_5000.h | 0 .../src/src_tiny_int16_1_3_3281_5000.h | 0 .../src/src_tiny_int16_20_21_3015_5000.h | 0 .../src/src_tiny_int16_21_20_3015_5000.h | 0 .../src/src_tiny_int16_2_1_3281_5000.h | 0 .../src/src_tiny_int16_2_3_3281_5000.h | 0 .../src/src_tiny_int16_3_1_1641_5000.h | 0 .../src/src_tiny_int16_3_1_3281_5000.h | 0 .../src/src_tiny_int16_3_2_3281_5000.h | 0 .../src/src_tiny_int16_7_8_3281_5000.h | 0 .../src/src_tiny_int16_8_7_3281_5000.h | 0 .../audio/coefficients/src/src_tiny_int16_define.h | 0 .../audio/coefficients/src/src_tiny_int16_table.h | 24 ++-- src/include/{reef => sof}/audio/component.h | 16 +-- src/include/{reef => sof}/audio/format.h | 0 src/include/{reef => sof}/audio/pipeline.h | 14 +-- src/include/{reef => sof}/clock.h | 2 +- src/include/{reef => sof}/dai.h | 2 +- src/include/{reef => sof}/debug.h | 4 +- src/include/{reef => sof}/dma-trace.h | 16 +-- src/include/{reef => sof}/dma.h | 8 +- src/include/{reef => sof}/dw-dma.h | 4 +- src/include/{reef => sof}/hda-dma.h | 0 src/include/{reef => sof}/init.h | 4 +- src/include/{reef => sof}/intel-ipc.h | 0 src/include/{reef => sof}/interrupt-map.h | 50 ++++---- src/include/{reef => sof}/interrupt.h | 10 +- src/include/{reef => sof}/io.h | 0 src/include/{reef => sof}/ipc.h | 16 +-- src/include/{reef => sof}/list.h | 0 src/include/{reef => sof}/lock.h | 6 +- src/include/{reef => sof}/mailbox.h | 2 +- src/include/{reef => sof}/math/Makefile.am | 0 src/include/{reef => sof}/math/numbers.h | 0 src/include/{reef => sof}/math/trig.h | 0 src/include/{reef => sof}/notifier.h | 6 +- src/include/{reef => sof}/panic.h | 8 +- src/include/{reef => sof}/schedule.h | 16 +-- src/include/{reef/reef.h => sof/sof.h} | 8 +- src/include/{reef => sof}/ssp.h | 12 +- src/include/{reef => sof}/stream.h | 4 +- src/include/{reef => sof}/string.h | 4 +- src/include/{reef => sof}/task.h | 4 +- src/include/{reef => sof}/test | 0 src/include/{reef => sof}/timer.h | 0 src/include/{reef => sof}/trace.h | 10 +- src/include/{reef => sof}/wait.h | 12 +- src/include/{reef => sof}/work.h | 4 +- src/init/Makefile.am | 2 +- src/init/init.c | 40 +++--- src/ipc/apl-ipc.c | 32 ++--- src/ipc/byt-ipc.c | 32 ++--- src/ipc/cnl-ipc.c | 32 ++--- src/ipc/dma-copy.c | 12 +- src/ipc/handler.c | 34 ++--- src/ipc/hsw-ipc.c | 34 ++--- src/ipc/ipc.c | 36 +++--- src/ipc/pmc-ipc.c | 16 +-- src/lib/Makefile.am | 2 +- src/lib/agent.c | 22 ++-- src/lib/alloc.c | 14 +-- src/lib/dma-trace.c | 16 +-- src/lib/interrupt.c | 30 ++--- src/lib/lib.c | 4 +- src/lib/notifier.c | 10 +- src/lib/schedule.c | 24 ++-- src/lib/trace.c | 14 +-- src/lib/work.c | 18 +-- src/library/include/platform/interrupt.h | 2 +- src/library/include/platform/timer.h | 2 +- src/math/numbers.c | 2 +- src/math/trig.c | 4 +- src/platform/apollolake/Makefile.am | 4 +- src/platform/apollolake/apollolake.x.in | 138 ++++++++++----------- src/platform/apollolake/base_module.c | 4 +- src/platform/apollolake/clk.c | 14 +-- src/platform/apollolake/dai.c | 10 +- src/platform/apollolake/dma.c | 6 +- src/platform/apollolake/include/platform/dma.h | 2 +- .../apollolake/include/platform/interrupt.h | 46 +++---- src/platform/apollolake/include/platform/memory.h | 68 +++++----- .../apollolake/include/platform/platform.h | 4 +- src/platform/apollolake/include/platform/timer.h | 2 +- src/platform/apollolake/interrupt.c | 28 ++--- src/platform/apollolake/memory.c | 2 +- src/platform/apollolake/platform.c | 38 +++--- src/platform/apollolake/timer.c | 4 +- src/platform/baytrail/Makefile.am | 2 +- src/platform/baytrail/baytrail.x.in | 124 +++++++++--------- src/platform/baytrail/clk.c | 14 +-- src/platform/baytrail/dai.c | 10 +- src/platform/baytrail/dma.c | 4 +- src/platform/baytrail/include/platform/interrupt.h | 2 +- src/platform/baytrail/include/platform/memory.h | 34 ++--- src/platform/baytrail/include/platform/platform.h | 4 +- src/platform/baytrail/include/platform/timer.h | 2 +- src/platform/baytrail/memory.c | 2 +- src/platform/baytrail/platform.c | 40 +++--- src/platform/baytrail/timer.c | 4 +- src/platform/cannonlake/Makefile.am | 6 +- src/platform/cannonlake/base_module.c | 2 +- src/platform/cannonlake/boot_ldr.x.in | 78 ++++++------ src/platform/cannonlake/cannonlake.x.in | 138 ++++++++++----------- src/platform/cannonlake/clk.c | 14 +-- src/platform/cannonlake/dai.c | 10 +- src/platform/cannonlake/dma.c | 6 +- .../cannonlake/include/platform/interrupt.h | 42 +++---- src/platform/cannonlake/include/platform/memory.h | 64 +++++----- .../cannonlake/include/platform/platform.h | 4 +- src/platform/cannonlake/include/platform/timer.h | 2 +- src/platform/cannonlake/interrupt.c | 28 ++--- src/platform/cannonlake/memory.c | 2 +- src/platform/cannonlake/platform.c | 38 +++--- src/platform/cannonlake/timer.c | 4 +- src/platform/haswell/Makefile.am | 2 +- src/platform/haswell/broadwell.x.in | 124 +++++++++--------- src/platform/haswell/clk.c | 14 +-- src/platform/haswell/dai.c | 10 +- src/platform/haswell/dma.c | 4 +- src/platform/haswell/haswell.x.in | 124 +++++++++--------- src/platform/haswell/include/platform/interrupt.h | 2 +- src/platform/haswell/include/platform/memory.h | 36 +++--- src/platform/haswell/include/platform/platform.h | 4 +- src/platform/haswell/include/platform/timer.h | 2 +- src/platform/haswell/memory.c | 2 +- src/platform/haswell/platform.c | 42 +++---- src/platform/haswell/timer.c | 4 +- src/tasks/Makefile.am | 2 +- src/tasks/audio.c | 26 ++-- version.sh | 6 +- 212 files changed, 1364 insertions(+), 1364 deletions(-) rename src/arch/host/include/arch/{reef.h => sof.h} (97%) rename src/arch/xtensa/include/arch/{reef.h => sof.h} (98%) rename src/include/{reef => sof}/Makefile.am (88%) rename src/include/{reef => sof}/agent.h (91%) rename src/include/{reef => sof}/alloc.h (98%) rename src/include/{reef => sof}/atomic.h (100%) rename src/include/{reef => sof}/audio/Makefile.am (67%) rename src/include/{reef => sof}/audio/buffer.h (97%) rename src/include/{reef => sof}/audio/coefficients/Makefile.am (100%) rename src/include/{reef => sof}/audio/coefficients/src/Makefile.am (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_10_21_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_10_9_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_16_7_4125_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_1_2_2292_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_1_2_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_1_3_2292_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_1_3_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_20_21_4211_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_20_7_3008_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_21_20_4211_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_21_40_4010_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_21_80_4010_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_2_1_2292_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_2_1_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_2_3_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_32_21_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_3_1_2292_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_3_1_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_3_2_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_3_4_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_40_21_4010_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_4_3_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_5_7_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_7_8_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_8_21_3274_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_8_7_2494_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_8_7_4583_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_define.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_std_int32_table.h (79%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_1_2_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_1_3_1641_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_1_3_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_20_21_3015_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_21_20_3015_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_2_1_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_2_3_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_3_1_1641_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_3_1_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_3_2_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_7_8_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_8_7_3281_5000.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_define.h (100%) rename src/include/{reef => sof}/audio/coefficients/src/src_tiny_int16_table.h (71%) rename src/include/{reef => sof}/audio/component.h (98%) rename src/include/{reef => sof}/audio/format.h (100%) rename src/include/{reef => sof}/audio/pipeline.h (96%) rename src/include/{reef => sof}/clock.h (98%) rename src/include/{reef => sof}/dai.h (99%) rename src/include/{reef => sof}/debug.h (99%) rename src/include/{reef => sof}/dma-trace.h (92%) rename src/include/{reef => sof}/dma.h (98%) rename src/include/{reef => sof}/dw-dma.h (97%) rename src/include/{reef => sof}/hda-dma.h (100%) rename src/include/{reef => sof}/init.h (97%) rename src/include/{reef => sof}/intel-ipc.h (100%) rename src/include/{reef => sof}/interrupt-map.h (68%) rename src/include/{reef => sof}/interrupt.h (95%) rename src/include/{reef => sof}/io.h (100%) rename src/include/{reef => sof}/ipc.h (96%) rename src/include/{reef => sof}/list.h (100%) rename src/include/{reef => sof}/lock.h (98%) rename src/include/{reef => sof}/mailbox.h (99%) rename src/include/{reef => sof}/math/Makefile.am (100%) rename src/include/{reef => sof}/math/numbers.h (100%) rename src/include/{reef => sof}/math/trig.h (100%) rename src/include/{reef => sof}/notifier.h (96%) rename src/include/{reef => sof}/panic.h (96%) rename src/include/{reef => sof}/schedule.h (94%) rename src/include/{reef/reef.h => sof/sof.h} (96%) rename src/include/{reef => sof}/ssp.h (98%) rename src/include/{reef => sof}/stream.h (96%) rename src/include/{reef => sof}/string.h (96%) rename src/include/{reef => sof}/task.h (97%) rename src/include/{reef => sof}/test (100%) rename src/include/{reef => sof}/timer.h (100%) rename src/include/{reef => sof}/trace.h (97%) rename src/include/{reef => sof}/wait.h (96%) rename src/include/{reef => sof}/work.h (98%)

diff --git a/.gitignore b/.gitignore index 5e5fea4..4c5b67b 100644 --- a/.gitignore +++ b/.gitignore @@ -42,9 +42,9 @@ autom4te* config.* *.gz *.xz -src/arch/xtensa/reef +src/arch/xtensa/sof src/arch/xtensa/boot_ldr -reef-* +sof-* boot_ldr-* boot_module module diff --git a/Makefile.am b/Makefile.am index 7a70823..1e4de76 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,7 @@ if BUILD_HOST export ARCH_INCDIR = \ -I $(SRC_DIR)/arch/$(ARCH)/include

-export REEF_INCDIR = \ +export SOF_INCDIR = \ -I $(SRC_DIR)/include

if BUILD_LIB @@ -23,7 +23,7 @@ export PLATFORM_INCDIR = \ endif

else -export REEF_INCDIR = \ +export SOF_INCDIR = \ -I $(SRC_DIR)/include \ -I $(ROOT_DIR)/include

diff --git a/configure.ac b/configure.ac index 9b74c6a..a0e2e2d 100644 --- a/configure.ac +++ b/configure.ac @@ -9,12 +9,12 @@ AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability subdir-objects silent-rule AM_MAINTAINER_MODE([enable])

# get version info from git -m4_define(reef_major, `cat .version | cut -dv -f2 | cut -d. -f1`) -m4_define(reef_minor, `cat .version | cut -d. -f2 | cut -d- -f1`) -m4_define(reef_micro, `cat .version | cut -d. -f3 | cut -d- -f1`) -AC_DEFINE_UNQUOTED([REEF_MAJOR], reef_major, [Reef major version]) -AC_DEFINE_UNQUOTED([REEF_MINOR], reef_minor, [Reef minor version]) -AC_DEFINE_UNQUOTED([REEF_MICRO], reef_micro, [Reef micro version]) +m4_define(sof_major, `cat .version | cut -dv -f2 | cut -d. -f1`) +m4_define(sof_minor, `cat .version | cut -d. -f2 | cut -d- -f1`) +m4_define(sof_micro, `cat .version | cut -d. -f3 | cut -d- -f1`) +AC_DEFINE_UNQUOTED([SOF_MAJOR], sof_major, [Sof major version]) +AC_DEFINE_UNQUOTED([SOF_MINOR], sof_minor, [Sof minor version]) +AC_DEFINE_UNQUOTED([SOF_MICRO], sof_micro, [Sof micro version])

AC_CANONICAL_HOST

@@ -354,11 +354,11 @@ AC_CONFIG_FILES([ src/math/Makefile src/drivers/Makefile src/include/Makefile - src/include/reef/Makefile - src/include/reef/audio/Makefile - src/include/reef/audio/coefficients/Makefile - src/include/reef/audio/coefficients/src/Makefile - src/include/reef/math/Makefile + src/include/sof/Makefile + src/include/sof/audio/Makefile + src/include/sof/audio/coefficients/Makefile + src/include/sof/audio/coefficients/src/Makefile + src/include/sof/math/Makefile src/include/uapi/Makefile src/ipc/Makefile src/library/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 291d45e..331dd0d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ export COMMON_INCDIR = \ - $(REEF_INCDIR) \ + $(SOF_INCDIR) \ $(ARCH_INCDIR) \ $(PLATFORM_INCDIR)

diff --git a/src/arch/host/include/arch/Makefile.am b/src/arch/host/include/arch/Makefile.am index bedfa1e..bf2de6d 100644 --- a/src/arch/host/include/arch/Makefile.am +++ b/src/arch/host/include/arch/Makefile.am @@ -3,7 +3,7 @@ includedir = $(prefix)/include/sof/arch include_HEADERS = \ cache.h \ interrupt.h \ - reef.h \ + sof.h \ spinlock.h \ timer.h \ wait.h diff --git a/src/arch/host/include/arch/interrupt.h b/src/arch/host/include/arch/interrupt.h index b2bb686..a3aea5a 100644 --- a/src/arch/host/include/arch/interrupt.h +++ b/src/arch/host/include/arch/interrupt.h @@ -32,7 +32,7 @@ #ifndef __ARCH_INTERRUPT_H #define __ARCH_INTERRUPT_H

-#include <reef/interrupt-map.h> +#include <sof/interrupt-map.h> #include <stdint.h> #include <stdlib.h> #include <unistd.h> diff --git a/src/arch/host/include/arch/reef.h b/src/arch/host/include/arch/sof.h similarity index 97% rename from src/arch/host/include/arch/reef.h rename to src/arch/host/include/arch/sof.h index c6e5629..75d0b25 100644 --- a/src/arch/host/include/arch/reef.h +++ b/src/arch/host/include/arch/sof.h @@ -29,8 +29,8 @@ * */

-#ifndef __INCLUDE_ARCH_REEF__ -#define __INCLUDE_ARCH_REEF__ +#ifndef __INCLUDE_ARCH_SOF__ +#define __INCLUDE_ARCH_SOF__

#include <stdint.h> #include <stdlib.h> diff --git a/src/arch/xtensa/Makefile.am b/src/arch/xtensa/Makefile.am index b94d14e..9f53e88 100644 --- a/src/arch/xtensa/Makefile.am +++ b/src/arch/xtensa/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = hal xtos include

noinst_PROGRAMS = \ - reef + sof

# generate linker script from platform headers LINK_SCRIPT = ../../platform/$(PLATFORM)/$(PLATFORM_LDSCRIPT) @@ -9,11 +9,11 @@ LINK_DEPS = \ ../../platform/$(PLATFORM)/include/platform/memory.h \ ../../platform/$(PLATFORM)/include/xtensa/config/core-isa*

-nodist_reef_SOURCES = $(LINK_SCRIPT).in +nodist_sof_SOURCES = $(LINK_SCRIPT).in BUILT_SOURCES = $(LINK_SCRIPT) CLEANFILES = $(LINK_SCRIPT) $(LINK_SCRIPT): Makefile $(LINK_SCRIPT).in $(LINK_DEPS) - cat $(LINK_SCRIPT).in | $(CPP) -P $(PLATFORM_INCDIR) $(REEF_INCDIR) - >$@ + cat $(LINK_SCRIPT).in | $(CPP) -P $(PLATFORM_INCDIR) $(SOF_INCDIR) - >$@

noinst_LIBRARIES = \ libreset.a @@ -28,7 +28,7 @@ libreset_a_CCASFLAGS = \ $(PLATFORM_INCDIR) \ -mtext-section-literals

-reef_SOURCES = \ +sof_SOURCES = \ crt1-boards.S \ _vectors.S \ init.c \ @@ -36,23 +36,23 @@ reef_SOURCES = \ task.c

if BUILD_CANNONLAKE -reef_SOURCES += \ +sof_SOURCES += \ main-entry.S endif

-reef_CFLAGS = \ +sof_CFLAGS = \ $(ARCH_INCDIR) \ $(ARCH_CFLAGS) \ - $(REEF_INCDIR) \ + $(SOF_INCDIR) \ $(PLATFORM_INCDIR)

-reef_CCASFLAGS = \ +sof_CCASFLAGS = \ $(ARCH_INCDIR) \ $(ASFLAGS) \ $(ARCH_ASFLAGS) \ $(PLATFORM_INCDIR)

-reef_LDADD = \ +sof_LDADD = \ ../../init/libinit.a \ ../../tasks/libtasks.a \ ../../lib/libcore.a \ @@ -70,13 +70,13 @@ reef_LDADD = \ hal/libhal.a \ -lgcc

-reef_LDFLAGS = \ - $(ARCH_LDFLAGS) -Wl,-Map=reef-$(FW_NAME).map \ +sof_LDFLAGS = \ + $(ARCH_LDFLAGS) -Wl,-Map=sof-$(FW_NAME).map \ -T ../../platform/$(PLATFORM)/$(PLATFORM_LDSCRIPT)

-RIMAGE_FLAGS = reef-$(FW_NAME) +RIMAGE_FLAGS = sof-$(FW_NAME) RIMAGE_BOOT_FLAGS = -BIN_FLAGS = reef +BIN_FLAGS = sof

if BUILD_BOOTLOADER

@@ -89,7 +89,7 @@ CLEANFILES += $(LINK_BOOT_LDR_SCRIPT)

nodist_boot_ldr_SOURCES = $(LINK_BOOT_LDR_SCRIPT).in $(LINK_BOOT_LDR_SCRIPT): Makefile $(LINK_BOOT_LDR_SCRIPT).in $(LINK_DEPS) - cat $(LINK_BOOT_LDR_SCRIPT).in | $(CPP) -P $(PLATFORM_INCDIR) $(REEF_INCDIR) - >$@ + cat $(LINK_BOOT_LDR_SCRIPT).in | $(CPP) -P $(PLATFORM_INCDIR) $(SOF_INCDIR) - >$@

boot_ldr_SOURCES = \ boot_entry.S \ @@ -99,7 +99,7 @@ boot_ldr_SOURCES = \ boot_ldr_CFLAGS = \ $(ARCH_INCDIR) \ $(ARCH_CFLAGS) \ - $(REEF_INCDIR) \ + $(SOF_INCDIR) \ $(PLATFORM_INCDIR)

boot_ldr_CCASFLAGS = \ @@ -139,22 +139,22 @@ endif if BUILD_MODULE MODULE_COPY=$(OBJCOPY) -O binary ../../platform/$(PLATFORM)/module mod-$(FW_NAME).bin MODULE_INSERT=$(OBJCOPY) --add-section .module=mod-$(FW_NAME).bin \ - --set-section-flags .module=load,readonly reef-$(FW_NAME) + --set-section-flags .module=load,readonly sof-$(FW_NAME) else MODULE_COPY= MODULE_INSERT= endif

bin-local: $(BIN_FLAGS) - cp reef reef-$(FW_NAME) + cp sof sof-$(FW_NAME) $(MODULE_COPY) $(MODULE_INSERT) - $(OBJDUMP) -S reef-$(FW_NAME) > reef-$(FW_NAME).lst - $(OBJDUMP) -D reef-$(FW_NAME) > reef-$(FW_NAME).dis - rimage -o reef-$(FW_NAME).ri -m $(FW_NAME) $(RIMAGE_BOOT_FLAGS) $(RIMAGE_FLAGS) + $(OBJDUMP) -S sof-$(FW_NAME) > sof-$(FW_NAME).lst + $(OBJDUMP) -D sof-$(FW_NAME) > sof-$(FW_NAME).dis + rimage -o sof-$(FW_NAME).ri -m $(FW_NAME) $(RIMAGE_BOOT_FLAGS) $(RIMAGE_FLAGS)

vminstall-local: - scp -P 5555 reef-*.ri root@localhost:/lib/firmware/intel/ + scp -P 5555 sof-*.ri root@localhost:/lib/firmware/intel/

clean-local: rm -fr mod-* diff --git a/src/arch/xtensa/boot_loader.c b/src/arch/xtensa/boot_loader.c index 05d6bf9..ccf8525 100644 --- a/src/arch/xtensa/boot_loader.c +++ b/src/arch/xtensa/boot_loader.c @@ -30,8 +30,8 @@

#include <arch/cache.h> #include <arch/wait.h> -#include <reef/trace.h> -#include <reef/io.h> +#include <sof/trace.h> +#include <sof/io.h> #include <uapi/manifest.h> #include <platform/memory.h>

diff --git a/src/arch/xtensa/include/arch/Makefile.am b/src/arch/xtensa/include/arch/Makefile.am index 135ef64..779e449 100644 --- a/src/arch/xtensa/include/arch/Makefile.am +++ b/src/arch/xtensa/include/arch/Makefile.am @@ -2,7 +2,7 @@ noinst_HEADERS = \ atomic.h \ cache.h \ interrupt.h \ - reef.h \ + sof.h \ spinlock.h \ task.h \ timer.h \ diff --git a/src/arch/xtensa/include/arch/interrupt.h b/src/arch/xtensa/include/arch/interrupt.h index 14f3eee..17ba85a 100644 --- a/src/arch/xtensa/include/arch/interrupt.h +++ b/src/arch/xtensa/include/arch/interrupt.h @@ -34,14 +34,14 @@

#include <xtensa/xtruntime.h> #include <xtensa/hal.h> -#include <reef/interrupt-map.h> +#include <sof/interrupt-map.h> #include <stdint.h> #include <stdlib.h>

static inline int arch_interrupt_register(int irq, void(*handler)(void *arg), void *arg) { - irq = REEF_IRQ_NUMBER(irq); + irq = SOF_IRQ_NUMBER(irq); xthal_set_intclear(0x1 << irq); _xtos_set_interrupt_handler_arg(irq, handler, arg); return 0; @@ -49,7 +49,7 @@ static inline int arch_interrupt_register(int irq,

static inline void arch_interrupt_unregister(int irq) { - irq = REEF_IRQ_NUMBER(irq); + irq = SOF_IRQ_NUMBER(irq); _xtos_set_interrupt_handler_arg(irq, NULL, NULL); }

@@ -63,13 +63,13 @@ static inline void arch_interrupt_unregister(int irq)

static inline void arch_interrupt_set(int irq) { - irq = REEF_IRQ_NUMBER(irq); + irq = SOF_IRQ_NUMBER(irq); xthal_set_intset(0x1 << irq); }

static inline void arch_interrupt_clear(int irq) { - irq = REEF_IRQ_NUMBER(irq); + irq = SOF_IRQ_NUMBER(irq); xthal_set_intclear(0x1 << irq); }

diff --git a/src/arch/xtensa/include/arch/reef.h b/src/arch/xtensa/include/arch/sof.h similarity index 98% rename from src/arch/xtensa/include/arch/reef.h rename to src/arch/xtensa/include/arch/sof.h index 7f9b7db..abace8f 100644 --- a/src/arch/xtensa/include/arch/reef.h +++ b/src/arch/xtensa/include/arch/sof.h @@ -29,12 +29,12 @@ * */

-#ifndef __INCLUDE_ARCH_REEF__ -#define __INCLUDE_ARCH_REEF__ +#ifndef __INCLUDE_ARCH_SOF__ +#define __INCLUDE_ARCH_SOF__

#include <stdint.h> #include <stddef.h> -#include <reef/mailbox.h> +#include <sof/mailbox.h> #include <uapi/ipc.h>

/* architecture specific stack frames to dump */ diff --git a/src/arch/xtensa/include/arch/string.h b/src/arch/xtensa/include/arch/string.h index 73f78bc..56258b3 100644 --- a/src/arch/xtensa/include/arch/string.h +++ b/src/arch/xtensa/include/arch/string.h @@ -29,8 +29,8 @@ * */

-#ifndef __INCLUDE_ARCH_STRING_REEF__ -#define __INCLUDE_ARCH_STRING_REEF__ +#ifndef __INCLUDE_ARCH_STRING_SOF__ +#define __INCLUDE_ARCH_STRING_SOF__

void *xthal_memcpy(void *dst, const void *src, size_t len);

diff --git a/src/arch/xtensa/init.c b/src/arch/xtensa/init.c index 24c9936..50350e9 100644 --- a/src/arch/xtensa/init.c +++ b/src/arch/xtensa/init.c @@ -31,13 +31,13 @@ #include <xtensa/xtruntime.h> #include <xtensa/hal.h> #include <platform/memory.h> -#include <reef/interrupt.h> +#include <sof/interrupt.h> #include <platform/interrupt.h> -#include <reef/mailbox.h> +#include <sof/mailbox.h> #include <arch/task.h> -#include <reef/panic.h> -#include <reef/init.h> -#include <reef/lock.h> +#include <sof/panic.h> +#include <sof/init.h> +#include <sof/lock.h> #include <stdint.h>

#if DEBUG_LOCKS @@ -75,7 +75,7 @@ static void register_exceptions(void) }

/* do any architecture init here */ -int arch_init(struct reef *reef) +int arch_init(struct sof *sof) { register_exceptions(); arch_assign_tasks(); diff --git a/src/arch/xtensa/main-entry.S b/src/arch/xtensa/main-entry.S index 27a18b4..c77a74a 100644 --- a/src/arch/xtensa/main-entry.S +++ b/src/arch/xtensa/main-entry.S @@ -30,7 +30,7 @@

/* * Entry point from boot loader. - * Fix link address of this entry to REEF_TEXT_START so that + * Fix link address of this entry to SOF_TEXT_START so that * it is easy for boot loader to jump to the baseFW becasue * the boot loader and baseFW are in different elf file. */ diff --git a/src/arch/xtensa/reset-vector.S b/src/arch/xtensa/reset-vector.S index 05f601d..397dbe2 100644 --- a/src/arch/xtensa/reset-vector.S +++ b/src/arch/xtensa/reset-vector.S @@ -581,7 +581,7 @@ unpackdone:

#if XCHAL_HAVE_BOOTLOADER /*ToDo refine the _start*/ - movi a0, REEF_TEXT_START + movi a0, SOF_TEXT_START callx0 a0 #else call0 _start // jump to _start (in crt1-*.S) diff --git a/src/arch/xtensa/task.c b/src/arch/xtensa/task.c index 0ffedeb..0072b1a 100644 --- a/src/arch/xtensa/task.c +++ b/src/arch/xtensa/task.c @@ -29,12 +29,12 @@ * */

-#include <reef/schedule.h> -#include <reef/interrupt.h> +#include <sof/schedule.h> +#include <sof/interrupt.h> #include <platform/platform.h> -#include <reef/debug.h> +#include <sof/debug.h> #include <arch/task.h> -#include <reef/alloc.h> +#include <sof/alloc.h> #include <stdint.h> #include <errno.h>

diff --git a/src/arch/xtensa/timer.c b/src/arch/xtensa/timer.c index 1da503f..3b499b1 100644 --- a/src/arch/xtensa/timer.c +++ b/src/arch/xtensa/timer.c @@ -34,10 +34,10 @@ #include <platform/memory.h> #include <platform/interrupt.h> #include <platform/timer.h> -#include <reef/mailbox.h> -#include <reef/debug.h> -#include <reef/timer.h> -#include <reef/interrupt.h> +#include <sof/mailbox.h> +#include <sof/debug.h> +#include <sof/timer.h> +#include <sof/interrupt.h> #include <stdint.h> #include <errno.h>

diff --git a/src/audio/buffer.c b/src/audio/buffer.c index a5d92b2..a4cb3dc 100644 --- a/src/audio/buffer.c +++ b/src/audio/buffer.c @@ -32,18 +32,18 @@ #include <stdint.h> #include <stddef.h> #include <errno.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/alloc.h> -#include <reef/debug.h> -#include <reef/ipc.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/alloc.h> +#include <sof/debug.h> +#include <sof/ipc.h> #include <platform/timer.h> #include <platform/platform.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> -#include <reef/audio/buffer.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h> +#include <sof/audio/buffer.h>

/* create a new component in the pipeline */ struct comp_buffer *buffer_new(struct sof_ipc_buffer *desc) diff --git a/src/audio/component.c b/src/audio/component.c index 605652a..319b401 100644 --- a/src/audio/component.c +++ b/src/audio/component.c @@ -31,13 +31,13 @@ #include <stdint.h> #include <stddef.h> #include <errno.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/alloc.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/alloc.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h> #include <uapi/ipc.h>

struct comp_data { diff --git a/src/audio/dai.c b/src/audio/dai.c index 5049490..d86df04 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -32,16 +32,16 @@ #include <stdint.h> #include <stddef.h> #include <errno.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/dai.h> -#include <reef/alloc.h> -#include <reef/dma.h> -#include <reef/wait.h> -#include <reef/stream.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/dai.h> +#include <sof/alloc.h> +#include <sof/dma.h> +#include <sof/wait.h> +#include <sof/stream.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h> #include <platform/dma.h> #include <arch/cache.h>

diff --git a/src/audio/eq_fir.c b/src/audio/eq_fir.c index 72cfe93..8566818 100644 --- a/src/audio/eq_fir.c +++ b/src/audio/eq_fir.c @@ -34,16 +34,16 @@ #include <stddef.h> #include <errno.h> #include <stdbool.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/alloc.h> -#include <reef/work.h> -#include <reef/clock.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> -#include <reef/audio/format.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/alloc.h> +#include <sof/work.h> +#include <sof/clock.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h> +#include <sof/audio/format.h> #include <uapi/ipc.h> #include <uapi/eq.h> #include "fir.h" diff --git a/src/audio/eq_iir.c b/src/audio/eq_iir.c index 239eead..b874518 100644 --- a/src/audio/eq_iir.c +++ b/src/audio/eq_iir.c @@ -34,16 +34,16 @@ #include <stddef.h> #include <errno.h> #include <stdbool.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/alloc.h> -#include <reef/work.h> -#include <reef/clock.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> -#include <reef/audio/format.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/alloc.h> +#include <sof/work.h> +#include <sof/clock.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h> +#include <sof/audio/format.h> #include <uapi/ipc.h> #include <uapi/eq.h> #include "eq_iir.h" diff --git a/src/audio/fir.c b/src/audio/fir.c index 044b35d..9c9fbdd 100644 --- a/src/audio/fir.c +++ b/src/audio/fir.c @@ -38,7 +38,7 @@ #include <stdio.h> #endif

-#include <reef/audio/format.h> +#include <sof/audio/format.h> #include "fir.h"

#ifdef MODULE_TEST diff --git a/src/audio/fir.h b/src/audio/fir.h index e682ef2..b80e000 100644 --- a/src/audio/fir.h +++ b/src/audio/fir.h @@ -30,7 +30,7 @@ * Keyon Jie yang.jie@linux.intel.com */

-#include <reef/audio/format.h> +#include <sof/audio/format.h>

#define MAX_FIR_LENGTH 192

diff --git a/src/audio/host.c b/src/audio/host.c index d346b5e..bee50ce 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -32,17 +32,17 @@ #include <stdint.h> #include <stddef.h> #include <errno.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/alloc.h> -#include <reef/trace.h> -#include <reef/dma.h> -#include <reef/ipc.h> -#include <reef/wait.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/alloc.h> +#include <sof/trace.h> +#include <sof/dma.h> +#include <sof/ipc.h> +#include <sof/wait.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h> #include <platform/dma.h> #include <arch/cache.h> #include <uapi/ipc.h> diff --git a/src/audio/iir.c b/src/audio/iir.c index b0d12f5..a56a962 100644 --- a/src/audio/iir.c +++ b/src/audio/iir.c @@ -38,7 +38,7 @@ #include <stdio.h> #endif

-#include <reef/audio/format.h> +#include <sof/audio/format.h> #include "iir.h"

/* diff --git a/src/audio/mixer.c b/src/audio/mixer.c index d05a40c..ac6b7f9 100644 --- a/src/audio/mixer.c +++ b/src/audio/mixer.c @@ -31,11 +31,11 @@

#include <stdint.h> #include <stddef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/alloc.h> -#include <reef/audio/component.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/alloc.h> +#include <sof/audio/component.h>

#define trace_mixer(__e) trace_event(TRACE_CLASS_MIXER, __e) #define tracev_mixer(__e) tracev_event(TRACE_CLASS_MIXER, __e) diff --git a/src/audio/mux.c b/src/audio/mux.c index ff6ad7c..e96c467 100644 --- a/src/audio/mux.c +++ b/src/audio/mux.c @@ -30,10 +30,10 @@

#include <stdint.h> #include <stddef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/audio/component.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/audio/component.h>

/* tracing */ #define trace_mux(__e) trace_event(TRACE_CLASS_MUX, __e) diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index 31ade4e..28243fc 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -32,18 +32,18 @@ #include <stdint.h> #include <stddef.h> #include <errno.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/alloc.h> -#include <reef/debug.h> -#include <reef/ipc.h> -#include <reef/lock.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/alloc.h> +#include <sof/debug.h> +#include <sof/ipc.h> +#include <sof/lock.h> #include <platform/timer.h> #include <platform/platform.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h>

struct pipeline_data { spinlock_t lock; diff --git a/src/audio/pipeline_static.c b/src/audio/pipeline_static.c index d307e09..cf71a36 100644 --- a/src/audio/pipeline_static.c +++ b/src/audio/pipeline_static.c @@ -34,16 +34,16 @@

#include <stdint.h> #include <stddef.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/dai.h> -#include <reef/ipc.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/dai.h> +#include <sof/ipc.h> #include <platform/clk.h> #include <platform/platform.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h>

/* 2 * 32 bit*/ diff --git a/src/audio/src.c b/src/audio/src.c index 1045bdf..cded8b8 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -33,26 +33,26 @@ #include <stdint.h> #include <stddef.h> #include <errno.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/alloc.h> -#include <reef/work.h> -#include <reef/clock.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/alloc.h> +#include <sof/work.h> +#include <sof/clock.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h> #include <uapi/ipc.h>

#include "src_config.h" #include "src.h"

#if SRC_SHORT -#include <reef/audio/coefficients/src/src_tiny_int16_define.h> -#include <reef/audio/coefficients/src/src_tiny_int16_table.h> +#include <sof/audio/coefficients/src/src_tiny_int16_define.h> +#include <sof/audio/coefficients/src/src_tiny_int16_table.h> #else -#include <reef/audio/coefficients/src/src_std_int32_define.h> -#include <reef/audio/coefficients/src/src_std_int32_table.h> +#include <sof/audio/coefficients/src/src_std_int32_define.h> +#include <sof/audio/coefficients/src/src_std_int32_table.h> #endif

#ifdef MODULE_TEST diff --git a/src/audio/src_generic.c b/src/audio/src_generic.c index 9caa090..d410277 100644 --- a/src/audio/src_generic.c +++ b/src/audio/src_generic.c @@ -34,9 +34,9 @@ */

#include <stdint.h> -#include <reef/alloc.h> -#include <reef/audio/format.h> -#include <reef/math/numbers.h> +#include <sof/alloc.h> +#include <sof/audio/format.h> +#include <sof/math/numbers.h>

#include "src_config.h" #include "src.h" diff --git a/src/audio/src_hifi2ep.c b/src/audio/src_hifi2ep.c index 0d03ffa..cf919a3 100644 --- a/src/audio/src_hifi2ep.c +++ b/src/audio/src_hifi2ep.c @@ -32,9 +32,9 @@ /* HiFi EP optimized code parts for SRC */

#include <stdint.h> -#include <reef/alloc.h> -#include <reef/audio/format.h> -#include <reef/math/numbers.h> +#include <sof/alloc.h> +#include <sof/audio/format.h> +#include <sof/math/numbers.h>

#include "src_config.h" #include "src.h" diff --git a/src/audio/src_hifi3.c b/src/audio/src_hifi3.c index 96d3c99..f2c174d 100644 --- a/src/audio/src_hifi3.c +++ b/src/audio/src_hifi3.c @@ -32,9 +32,9 @@ /* HiFi3 optimized code parts for SRC */

#include <stdint.h> -#include <reef/alloc.h> -#include <reef/audio/format.h> -#include <reef/math/numbers.h> +#include <sof/alloc.h> +#include <sof/audio/format.h> +#include <sof/math/numbers.h>

#include "src_config.h" #include "src.h" diff --git a/src/audio/switch.c b/src/audio/switch.c index 5b4a8c8..cde300b 100644 --- a/src/audio/switch.c +++ b/src/audio/switch.c @@ -30,10 +30,10 @@

#include <stdint.h> #include <stddef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/audio/component.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/audio/component.h>

/* tracing */ #define trace_switch(__e) trace_event(TRACE_CLASS_SWITCH, __e) diff --git a/src/audio/tone.c b/src/audio/tone.c index af23cc4..eee6091 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -34,17 +34,17 @@ #include <stddef.h> #include <errno.h> #include <stdbool.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/alloc.h> -#include <reef/work.h> -#include <reef/clock.h> -#include <reef/audio/component.h> -#include <reef/audio/format.h> -#include <reef/audio/pipeline.h> -#include <reef/math/trig.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/alloc.h> +#include <sof/work.h> +#include <sof/clock.h> +#include <sof/audio/component.h> +#include <sof/audio/format.h> +#include <sof/audio/pipeline.h> +#include <sof/math/trig.h> #include <uapi/ipc.h> #include <uapi/tone.h>

diff --git a/src/audio/volume.c b/src/audio/volume.c index cff09a3..d0b690b 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -32,16 +32,16 @@ #include <stdint.h> #include <stddef.h> #include <errno.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/alloc.h> -#include <reef/work.h> -#include <reef/clock.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> -#include <reef/audio/format.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/alloc.h> +#include <sof/work.h> +#include <sof/clock.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h> +#include <sof/audio/format.h>

#define trace_volume(__e) trace_event(TRACE_CLASS_VOLUME, __e) #define tracev_volume(__e) tracev_event(TRACE_CLASS_VOLUME, __e) diff --git a/src/drivers/Makefile.am b/src/drivers/Makefile.am index f4f0fa4..99232a3 100644 --- a/src/drivers/Makefile.am +++ b/src/drivers/Makefile.am @@ -23,6 +23,6 @@ endif

libdrivers_a_CFLAGS = \ $(ARCH_CFLAGS) \ - $(REEF_INCDIR) \ + $(SOF_INCDIR) \ $(ARCH_INCDIR) \ $(PLATFORM_INCDIR) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index 9af28a8..45b074f 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -32,10 +32,10 @@

#include <errno.h> #include <stdbool.h> -#include <reef/stream.h> -#include <reef/ssp.h> -#include <reef/alloc.h> -#include <reef/interrupt.h> +#include <sof/stream.h> +#include <sof/ssp.h> +#include <sof/alloc.h> +#include <sof/interrupt.h> #include <config.h>

/* tracing */ diff --git a/src/drivers/byt-ssp.c b/src/drivers/byt-ssp.c index ae9c58c..87d1b79 100644 --- a/src/drivers/byt-ssp.c +++ b/src/drivers/byt-ssp.c @@ -31,10 +31,10 @@

#include <errno.h> #include <stdbool.h> -#include <reef/stream.h> -#include <reef/ssp.h> -#include <reef/alloc.h> -#include <reef/interrupt.h> +#include <sof/stream.h> +#include <sof/ssp.h> +#include <sof/alloc.h> +#include <sof/interrupt.h>

/* tracing */ #define trace_ssp(__e) trace_event(TRACE_CLASS_SSP, __e) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index a21ecc5..e0fbc5f 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -29,7 +29,7 @@ * Keyon Jie yang.jie@linux.intel.com * * - * This driver API will only be called by 3 clients in reef :- + * This driver API will only be called by 3 clients in sof :- * * 1. Host audio component. This component represents the ALSA PCM device * and involves copying data to/from the host ALSA audio buffer to/from the @@ -43,20 +43,20 @@ * used to construct the DMA configuration for the host client 1 above. */

-#include <reef/debug.h> -#include <reef/reef.h> -#include <reef/dma.h> -#include <reef/dw-dma.h> -#include <reef/io.h> -#include <reef/stream.h> -#include <reef/timer.h> -#include <reef/alloc.h> -#include <reef/interrupt.h> -#include <reef/work.h> -#include <reef/lock.h> -#include <reef/trace.h> -#include <reef/wait.h> -#include <reef/audio/component.h> +#include <sof/debug.h> +#include <sof/sof.h> +#include <sof/dma.h> +#include <sof/dw-dma.h> +#include <sof/io.h> +#include <sof/stream.h> +#include <sof/timer.h> +#include <sof/alloc.h> +#include <sof/interrupt.h> +#include <sof/work.h> +#include <sof/lock.h> +#include <sof/trace.h> +#include <sof/wait.h> +#include <sof/audio/component.h> #include <platform/dma.h> #include <platform/platform.h> #include <platform/interrupt.h> @@ -1023,7 +1023,7 @@ static int dw_dma_probe(struct dma *dma) dma_int[i]->dma = dma; dma_int[i]->channel = i; dma_int[i]->irq = dma->plat_data.irq + - (i << REEF_IRQ_BIT_SHIFT); + (i << SOF_IRQ_BIT_SHIFT);

/* register our IRQ handler */ interrupt_register(dma_int[i]->irq, diff --git a/src/drivers/hda-dma.c b/src/drivers/hda-dma.c index c00fb2e..97ea0ef 100644 --- a/src/drivers/hda-dma.c +++ b/src/drivers/hda-dma.c @@ -32,16 +32,16 @@ #include <stdint.h> #include <stddef.h> #include <errno.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/alloc.h> -#include <reef/trace.h> -#include <reef/dma.h> -#include <reef/io.h> -#include <reef/ipc.h> -#include <reef/wait.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/alloc.h> +#include <sof/trace.h> +#include <sof/dma.h> +#include <sof/io.h> +#include <sof/ipc.h> +#include <sof/wait.h> #include <platform/dma.h> #include <arch/cache.h> #include <uapi/ipc.h> diff --git a/src/include/Makefile.am b/src/include/Makefile.am index a42403b..e7ba93b 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = reef uapi +SUBDIRS = sof uapi

version.h: $(top_srcdir)/version.sh $(top_srcdir) diff --git a/src/include/reef/Makefile.am b/src/include/sof/Makefile.am similarity index 88% rename from src/include/reef/Makefile.am rename to src/include/sof/Makefile.am index f6f9bb2..f620835 100644 --- a/src/include/reef/Makefile.am +++ b/src/include/sof/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = audio math noinst_HEADERS = \ agent.h

-includedir = $(prefix)/include/sof/reef +includedir = $(prefix)/include/sof/sof

include_HEADERS = \ alloc.h \ @@ -25,7 +25,7 @@ include_HEADERS = \ mailbox.h \ notifier.h \ panic.h \ - reef.h \ + sof.h \ schedule.h \ ssp.h \ stream.h \ diff --git a/src/include/reef/agent.h b/src/include/sof/agent.h similarity index 91% rename from src/include/reef/agent.h rename to src/include/sof/agent.h index 53912b5..3d94c35 100644 --- a/src/include/reef/agent.h +++ b/src/include/sof/agent.h @@ -28,14 +28,14 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#ifndef __INCLUDE_REEF_AGENT__ -#define __INCLUDE_REEF_AGENT__ +#ifndef __INCLUDE_SOF_AGENT__ +#define __INCLUDE_SOF_AGENT__

#include <stdint.h> #include <stddef.h> -#include <reef/work.h> +#include <sof/work.h>

-struct reef; +struct sof;

/* simple agent */ struct sa { @@ -44,7 +44,7 @@ struct sa { struct work work; };

-void sa_enter_idle(struct reef *reef); -void sa_init(struct reef *reef); +void sa_enter_idle(struct sof *sof); +void sa_init(struct sof *sof);

#endif diff --git a/src/include/reef/alloc.h b/src/include/sof/alloc.h similarity index 98% rename from src/include/reef/alloc.h rename to src/include/sof/alloc.h index a2b0c9b..d87795d 100644 --- a/src/include/reef/alloc.h +++ b/src/include/sof/alloc.h @@ -34,10 +34,10 @@

#include <string.h> #include <stdint.h> -#include <reef/dma.h> +#include <sof/dma.h> #include <platform/memory.h>

-struct reef; +struct sof;

/* Heap Memory Zones * @@ -120,5 +120,5 @@ int mm_pm_context_save(struct dma_copy *dc, struct dma_sg_config *sg); int mm_pm_context_restore(struct dma_copy *dc, struct dma_sg_config *sg);

/* heap initialisation */ -void init_heap(struct reef *reef); +void init_heap(struct sof *sof); #endif diff --git a/src/include/reef/atomic.h b/src/include/sof/atomic.h similarity index 100% rename from src/include/reef/atomic.h rename to src/include/sof/atomic.h diff --git a/src/include/reef/audio/Makefile.am b/src/include/sof/audio/Makefile.am similarity index 67% rename from src/include/reef/audio/Makefile.am rename to src/include/sof/audio/Makefile.am index 1d2b9cb..0717617 100644 --- a/src/include/reef/audio/Makefile.am +++ b/src/include/sof/audio/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = coefficients

-includedir = $(prefix)/include/sof/reef/audio +includedir = $(prefix)/include/sof/sof/audio

include_HEADERS = \ component.h \ diff --git a/src/include/reef/audio/buffer.h b/src/include/sof/audio/buffer.h similarity index 97% rename from src/include/reef/audio/buffer.h rename to src/include/sof/audio/buffer.h index 1cea04f..9193a78 100644 --- a/src/include/reef/audio/buffer.h +++ b/src/include/sof/audio/buffer.h @@ -33,13 +33,13 @@

#include <stdint.h> #include <stddef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/dma.h> -#include <reef/audio/component.h> -#include <reef/trace.h> -#include <reef/schedule.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/dma.h> +#include <sof/audio/component.h> +#include <sof/trace.h> +#include <sof/schedule.h> #include <uapi/ipc.h>

/* pipeline tracing */ diff --git a/src/include/reef/audio/coefficients/Makefile.am b/src/include/sof/audio/coefficients/Makefile.am similarity index 100% rename from src/include/reef/audio/coefficients/Makefile.am rename to src/include/sof/audio/coefficients/Makefile.am diff --git a/src/include/reef/audio/coefficients/src/Makefile.am b/src/include/sof/audio/coefficients/src/Makefile.am similarity index 100% rename from src/include/reef/audio/coefficients/src/Makefile.am rename to src/include/sof/audio/coefficients/src/Makefile.am diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_10_21_4583_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_10_21_4583_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_10_21_4583_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_10_21_4583_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_10_9_4583_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_10_9_4583_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_10_9_4583_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_10_9_4583_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_16_7_4125_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_16_7_4125_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_16_7_4125_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_16_7_4125_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_1_2_2292_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_1_2_2292_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_1_2_2292_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_1_2_2292_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_1_2_4583_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_1_2_4583_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_1_2_4583_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_1_2_4583_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_1_3_2292_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_1_3_2292_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_1_3_2292_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_1_3_2292_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_1_3_4583_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_1_3_4583_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_1_3_4583_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_1_3_4583_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_20_21_4211_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_20_21_4211_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_20_21_4211_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_20_21_4211_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_20_7_3008_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_20_7_3008_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_20_7_3008_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_20_7_3008_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_21_20_4211_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_21_20_4211_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_21_20_4211_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_21_20_4211_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_21_40_4010_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_21_40_4010_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_21_40_4010_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_21_40_4010_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_21_80_4010_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_21_80_4010_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_21_80_4010_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_21_80_4010_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_2_1_2292_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_2_1_2292_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_2_1_2292_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_2_1_2292_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_2_1_4583_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_2_1_4583_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_2_1_4583_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_2_1_4583_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_2_3_4583_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_2_3_4583_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_2_3_4583_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_2_3_4583_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_32_21_4583_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_32_21_4583_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_32_21_4583_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_32_21_4583_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_3_1_2292_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_3_1_2292_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_3_1_2292_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_3_1_2292_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_3_1_4583_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_3_1_4583_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_3_1_4583_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_3_1_4583_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_3_2_4583_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_3_2_4583_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_3_2_4583_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_3_2_4583_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_3_4_4583_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_3_4_4583_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_3_4_4583_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_3_4_4583_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_40_21_4010_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_40_21_4010_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_40_21_4010_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_40_21_4010_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_4_3_4583_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_4_3_4583_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_4_3_4583_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_4_3_4583_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_5_7_4583_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_5_7_4583_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_5_7_4583_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_5_7_4583_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_7_8_4583_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_7_8_4583_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_7_8_4583_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_7_8_4583_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_8_21_3274_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_8_21_3274_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_8_21_3274_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_8_21_3274_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_8_7_2494_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_8_7_2494_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_8_7_2494_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_8_7_2494_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_8_7_4583_5000.h b/src/include/sof/audio/coefficients/src/src_std_int32_8_7_4583_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_8_7_4583_5000.h rename to src/include/sof/audio/coefficients/src/src_std_int32_8_7_4583_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_define.h b/src/include/sof/audio/coefficients/src/src_std_int32_define.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_std_int32_define.h rename to src/include/sof/audio/coefficients/src/src_std_int32_define.h diff --git a/src/include/reef/audio/coefficients/src/src_std_int32_table.h b/src/include/sof/audio/coefficients/src/src_std_int32_table.h similarity index 79% rename from src/include/reef/audio/coefficients/src/src_std_int32_table.h rename to src/include/sof/audio/coefficients/src/src_std_int32_table.h index 9f39691..fc84d80 100644 --- a/src/include/reef/audio/coefficients/src/src_std_int32_table.h +++ b/src/include/sof/audio/coefficients/src/src_std_int32_table.h @@ -1,31 +1,31 @@ /* SRC conversions */ -#include <reef/audio/coefficients/src/src_std_int32_1_2_2292_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_1_2_4583_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_1_3_2292_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_1_3_4583_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_2_1_2292_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_2_1_4583_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_2_3_4583_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_3_1_2292_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_3_1_4583_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_3_2_4583_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_3_4_4583_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_4_3_4583_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_5_7_4583_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_7_8_4583_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_8_7_2494_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_8_7_4583_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_8_21_3274_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_10_9_4583_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_10_21_4583_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_16_7_4125_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_20_7_3008_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_20_21_4211_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_21_20_4211_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_21_40_4010_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_21_80_4010_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_32_21_4583_5000.h> -#include <reef/audio/coefficients/src/src_std_int32_40_21_4010_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_1_2_2292_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_1_2_4583_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_1_3_2292_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_1_3_4583_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_2_1_2292_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_2_1_4583_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_2_3_4583_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_3_1_2292_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_3_1_4583_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_3_2_4583_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_3_4_4583_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_4_3_4583_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_5_7_4583_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_7_8_4583_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_8_7_2494_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_8_7_4583_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_8_21_3274_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_10_9_4583_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_10_21_4583_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_16_7_4125_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_20_7_3008_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_20_21_4211_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_21_20_4211_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_21_40_4010_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_21_80_4010_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_32_21_4583_5000.h> +#include <sof/audio/coefficients/src/src_std_int32_40_21_4010_5000.h>

/* SRC table */ int32_t fir_one = 1073741824; diff --git a/src/include/reef/audio/coefficients/src/src_tiny_int16_1_2_3281_5000.h b/src/include/sof/audio/coefficients/src/src_tiny_int16_1_2_3281_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_tiny_int16_1_2_3281_5000.h rename to src/include/sof/audio/coefficients/src/src_tiny_int16_1_2_3281_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_tiny_int16_1_3_1641_5000.h b/src/include/sof/audio/coefficients/src/src_tiny_int16_1_3_1641_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_tiny_int16_1_3_1641_5000.h rename to src/include/sof/audio/coefficients/src/src_tiny_int16_1_3_1641_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_tiny_int16_1_3_3281_5000.h b/src/include/sof/audio/coefficients/src/src_tiny_int16_1_3_3281_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_tiny_int16_1_3_3281_5000.h rename to src/include/sof/audio/coefficients/src/src_tiny_int16_1_3_3281_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_tiny_int16_20_21_3015_5000.h b/src/include/sof/audio/coefficients/src/src_tiny_int16_20_21_3015_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_tiny_int16_20_21_3015_5000.h rename to src/include/sof/audio/coefficients/src/src_tiny_int16_20_21_3015_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_tiny_int16_21_20_3015_5000.h b/src/include/sof/audio/coefficients/src/src_tiny_int16_21_20_3015_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_tiny_int16_21_20_3015_5000.h rename to src/include/sof/audio/coefficients/src/src_tiny_int16_21_20_3015_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_tiny_int16_2_1_3281_5000.h b/src/include/sof/audio/coefficients/src/src_tiny_int16_2_1_3281_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_tiny_int16_2_1_3281_5000.h rename to src/include/sof/audio/coefficients/src/src_tiny_int16_2_1_3281_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_tiny_int16_2_3_3281_5000.h b/src/include/sof/audio/coefficients/src/src_tiny_int16_2_3_3281_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_tiny_int16_2_3_3281_5000.h rename to src/include/sof/audio/coefficients/src/src_tiny_int16_2_3_3281_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_tiny_int16_3_1_1641_5000.h b/src/include/sof/audio/coefficients/src/src_tiny_int16_3_1_1641_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_tiny_int16_3_1_1641_5000.h rename to src/include/sof/audio/coefficients/src/src_tiny_int16_3_1_1641_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_tiny_int16_3_1_3281_5000.h b/src/include/sof/audio/coefficients/src/src_tiny_int16_3_1_3281_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_tiny_int16_3_1_3281_5000.h rename to src/include/sof/audio/coefficients/src/src_tiny_int16_3_1_3281_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_tiny_int16_3_2_3281_5000.h b/src/include/sof/audio/coefficients/src/src_tiny_int16_3_2_3281_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_tiny_int16_3_2_3281_5000.h rename to src/include/sof/audio/coefficients/src/src_tiny_int16_3_2_3281_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_tiny_int16_7_8_3281_5000.h b/src/include/sof/audio/coefficients/src/src_tiny_int16_7_8_3281_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_tiny_int16_7_8_3281_5000.h rename to src/include/sof/audio/coefficients/src/src_tiny_int16_7_8_3281_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_tiny_int16_8_7_3281_5000.h b/src/include/sof/audio/coefficients/src/src_tiny_int16_8_7_3281_5000.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_tiny_int16_8_7_3281_5000.h rename to src/include/sof/audio/coefficients/src/src_tiny_int16_8_7_3281_5000.h diff --git a/src/include/reef/audio/coefficients/src/src_tiny_int16_define.h b/src/include/sof/audio/coefficients/src/src_tiny_int16_define.h similarity index 100% rename from src/include/reef/audio/coefficients/src/src_tiny_int16_define.h rename to src/include/sof/audio/coefficients/src/src_tiny_int16_define.h diff --git a/src/include/reef/audio/coefficients/src/src_tiny_int16_table.h b/src/include/sof/audio/coefficients/src/src_tiny_int16_table.h similarity index 71% rename from src/include/reef/audio/coefficients/src/src_tiny_int16_table.h rename to src/include/sof/audio/coefficients/src/src_tiny_int16_table.h index 052867d..63eddae 100644 --- a/src/include/reef/audio/coefficients/src/src_tiny_int16_table.h +++ b/src/include/sof/audio/coefficients/src/src_tiny_int16_table.h @@ -1,16 +1,16 @@ /* SRC conversions */ -#include <reef/audio/coefficients/src/src_tiny_int16_1_2_3281_5000.h> -#include <reef/audio/coefficients/src/src_tiny_int16_1_3_1641_5000.h> -#include <reef/audio/coefficients/src/src_tiny_int16_1_3_3281_5000.h> -#include <reef/audio/coefficients/src/src_tiny_int16_2_1_3281_5000.h> -#include <reef/audio/coefficients/src/src_tiny_int16_2_3_3281_5000.h> -#include <reef/audio/coefficients/src/src_tiny_int16_3_1_1641_5000.h> -#include <reef/audio/coefficients/src/src_tiny_int16_3_1_3281_5000.h> -#include <reef/audio/coefficients/src/src_tiny_int16_3_2_3281_5000.h> -#include <reef/audio/coefficients/src/src_tiny_int16_7_8_3281_5000.h> -#include <reef/audio/coefficients/src/src_tiny_int16_8_7_3281_5000.h> -#include <reef/audio/coefficients/src/src_tiny_int16_20_21_3015_5000.h> -#include <reef/audio/coefficients/src/src_tiny_int16_21_20_3015_5000.h> +#include <sof/audio/coefficients/src/src_tiny_int16_1_2_3281_5000.h> +#include <sof/audio/coefficients/src/src_tiny_int16_1_3_1641_5000.h> +#include <sof/audio/coefficients/src/src_tiny_int16_1_3_3281_5000.h> +#include <sof/audio/coefficients/src/src_tiny_int16_2_1_3281_5000.h> +#include <sof/audio/coefficients/src/src_tiny_int16_2_3_3281_5000.h> +#include <sof/audio/coefficients/src/src_tiny_int16_3_1_1641_5000.h> +#include <sof/audio/coefficients/src/src_tiny_int16_3_1_3281_5000.h> +#include <sof/audio/coefficients/src/src_tiny_int16_3_2_3281_5000.h> +#include <sof/audio/coefficients/src/src_tiny_int16_7_8_3281_5000.h> +#include <sof/audio/coefficients/src/src_tiny_int16_8_7_3281_5000.h> +#include <sof/audio/coefficients/src/src_tiny_int16_20_21_3015_5000.h> +#include <sof/audio/coefficients/src/src_tiny_int16_21_20_3015_5000.h>

/* SRC table */ int16_t fir_one = 16384; diff --git a/src/include/reef/audio/component.h b/src/include/sof/audio/component.h similarity index 98% rename from src/include/reef/audio/component.h rename to src/include/sof/audio/component.h index 2e58170..35ed618 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/sof/audio/component.h @@ -34,14 +34,14 @@

#include <stdint.h> #include <stddef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/reef.h> -#include <reef/alloc.h> -#include <reef/dma.h> -#include <reef/stream.h> -#include <reef/audio/buffer.h> -#include <reef/audio/pipeline.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/sof.h> +#include <sof/alloc.h> +#include <sof/dma.h> +#include <sof/stream.h> +#include <sof/audio/buffer.h> +#include <sof/audio/pipeline.h> #include <uapi/ipc.h>

/* diff --git a/src/include/reef/audio/format.h b/src/include/sof/audio/format.h similarity index 100% rename from src/include/reef/audio/format.h rename to src/include/sof/audio/format.h diff --git a/src/include/reef/audio/pipeline.h b/src/include/sof/audio/pipeline.h similarity index 96% rename from src/include/reef/audio/pipeline.h rename to src/include/sof/audio/pipeline.h index 8e5dae3..57d2488 100644 --- a/src/include/reef/audio/pipeline.h +++ b/src/include/sof/audio/pipeline.h @@ -33,13 +33,13 @@

#include <stdint.h> #include <stddef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/dma.h> -#include <reef/audio/component.h> -#include <reef/trace.h> -#include <reef/schedule.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/dma.h> +#include <sof/audio/component.h> +#include <sof/trace.h> +#include <sof/schedule.h> #include <uapi/ipc.h>

/* pipeline tracing */ diff --git a/src/include/reef/clock.h b/src/include/sof/clock.h similarity index 98% rename from src/include/reef/clock.h rename to src/include/sof/clock.h index e8691e7..a7a0913 100644 --- a/src/include/reef/clock.h +++ b/src/include/sof/clock.h @@ -31,7 +31,7 @@ #ifndef __INCLUDE_CLOCK__ #define __INCLUDE_CLOCK__

-#include <reef/notifier.h> +#include <sof/notifier.h> #include <stdint.h>

#define CLOCK_NOTIFY_PRE 0 diff --git a/src/include/reef/dai.h b/src/include/sof/dai.h similarity index 99% rename from src/include/reef/dai.h rename to src/include/sof/dai.h index 75eabce..e3bce1d 100644 --- a/src/include/reef/dai.h +++ b/src/include/sof/dai.h @@ -33,7 +33,7 @@ #define __INCLUDE_DAI_H__

#include <stdint.h> -#include <reef/audio/component.h> +#include <sof/audio/component.h>

#define DAI_CLOCK_IN 0 #define DAI_CLOCK_OUT 1 diff --git a/src/include/reef/debug.h b/src/include/sof/debug.h similarity index 99% rename from src/include/reef/debug.h rename to src/include/sof/debug.h index 672fa5b..437e773 100644 --- a/src/include/reef/debug.h +++ b/src/include/sof/debug.h @@ -32,8 +32,8 @@ #ifndef __INCLUDE_DEBUG__ #define __INCLUDE_DEBUG__

-#include <reef/reef.h> -#include <reef/mailbox.h> +#include <sof/sof.h> +#include <sof/mailbox.h> #include <uapi/ipc.h> #include <platform/platform.h> #include <stdint.h> diff --git a/src/include/reef/dma-trace.h b/src/include/sof/dma-trace.h similarity index 92% rename from src/include/reef/dma-trace.h rename to src/include/sof/dma-trace.h index c5982d2..81ce0a2 100644 --- a/src/include/reef/dma-trace.h +++ b/src/include/sof/dma-trace.h @@ -33,13 +33,13 @@

#include <stdint.h> #include <stdlib.h> -#include <reef/reef.h> -#include <reef/list.h> -#include <reef/mailbox.h> -#include <reef/debug.h> -#include <reef/timer.h> -#include <reef/dma.h> -#include <reef/work.h> +#include <sof/sof.h> +#include <sof/list.h> +#include <sof/mailbox.h> +#include <sof/debug.h> +#include <sof/timer.h> +#include <sof/dma.h> +#include <sof/work.h> #include <platform/platform.h> #include <platform/timer.h>

@@ -68,7 +68,7 @@ struct dma_trace_data { spinlock_t lock; };

-int dma_trace_init_early(struct reef *reef); +int dma_trace_init_early(struct sof *sof); int dma_trace_init_complete(struct dma_trace_data *d); int dma_trace_host_buffer(struct dma_trace_data *d, struct dma_sg_elem *elem, uint32_t host_size); diff --git a/src/include/reef/dma.h b/src/include/sof/dma.h similarity index 98% rename from src/include/reef/dma.h rename to src/include/sof/dma.h index f137bf5..7ba1298 100644 --- a/src/include/reef/dma.h +++ b/src/include/sof/dma.h @@ -33,10 +33,10 @@ #define __INCLUDE_DMA_H__

#include <stdint.h> -#include <reef/list.h> -#include <reef/lock.h> -#include <reef/reef.h> -#include <reef/wait.h> +#include <sof/list.h> +#include <sof/lock.h> +#include <sof/sof.h> +#include <sof/wait.h>

/* types of DMA directions */ enum dma_copy_dir { diff --git a/src/include/reef/dw-dma.h b/src/include/sof/dw-dma.h similarity index 97% rename from src/include/reef/dw-dma.h rename to src/include/sof/dw-dma.h index c9e7aef..90c4553 100644 --- a/src/include/reef/dw-dma.h +++ b/src/include/sof/dw-dma.h @@ -29,8 +29,8 @@ * Keyon Jie yang.jie@linux.intel.com */

-#ifndef __REEF_DW_DMA_H__ -#define __REEF_DW_DMA_H__ +#ifndef __SOF_DW_DMA_H__ +#define __SOF_DW_DMA_H__

#include <stdint.h>

diff --git a/src/include/reef/hda-dma.h b/src/include/sof/hda-dma.h similarity index 100% rename from src/include/reef/hda-dma.h rename to src/include/sof/hda-dma.h diff --git a/src/include/reef/init.h b/src/include/sof/init.h similarity index 97% rename from src/include/reef/init.h rename to src/include/sof/init.h index 9d97b48..f5ac6d5 100644 --- a/src/include/reef/init.h +++ b/src/include/sof/init.h @@ -31,12 +31,12 @@ #ifndef __INCLUDE_INIT_H__ #define __INCLUDE_INIT_H__

-struct reef; +struct sof;

/* main firmware entry point - argc and argv not currently used */ int main(int argc, char *argv[]);

-int arch_init(struct reef *reef); +int arch_init(struct sof *sof);

void __memmap_init(void);

diff --git a/src/include/reef/intel-ipc.h b/src/include/sof/intel-ipc.h similarity index 100% rename from src/include/reef/intel-ipc.h rename to src/include/sof/intel-ipc.h diff --git a/src/include/reef/interrupt-map.h b/src/include/sof/interrupt-map.h similarity index 68% rename from src/include/reef/interrupt-map.h rename to src/include/sof/interrupt-map.h index 164cec2..bea567a 100644 --- a/src/include/reef/interrupt-map.h +++ b/src/include/sof/interrupt-map.h @@ -33,20 +33,20 @@

#include <config.h>

-#define REEF_IRQ_BIT_SHIFT 24 -#define REEF_IRQ_LEVEL_SHIFT 16 -#define REEF_IRQ_CPU_SHIFT 8 -#define REEF_IRQ_NUM_SHIFT 0 -#define REEF_IRQ_NUM_MASK 0xff -#define REEF_IRQ_LEVEL_MASK 0xff -#define REEF_IRQ_BIT_MASK 0x1f -#define REEF_IRQ_CPU_MASK 0xff +#define SOF_IRQ_BIT_SHIFT 24 +#define SOF_IRQ_LEVEL_SHIFT 16 +#define SOF_IRQ_CPU_SHIFT 8 +#define SOF_IRQ_NUM_SHIFT 0 +#define SOF_IRQ_NUM_MASK 0xff +#define SOF_IRQ_LEVEL_MASK 0xff +#define SOF_IRQ_BIT_MASK 0x1f +#define SOF_IRQ_CPU_MASK 0xff

-#define REEF_IRQ(_bit, _level, _cpu, _number) \ - (((_bit) << REEF_IRQ_BIT_SHIFT) \ - | ((_level) << REEF_IRQ_LEVEL_SHIFT) \ - | ((_cpu) << REEF_IRQ_CPU_SHIFT) \ - | ((_number) << REEF_IRQ_NUM_SHIFT)) +#define SOF_IRQ(_bit, _level, _cpu, _number) \ + (((_bit) << SOF_IRQ_BIT_SHIFT) \ + | ((_level) << SOF_IRQ_LEVEL_SHIFT) \ + | ((_cpu) << SOF_IRQ_CPU_SHIFT) \ + | ((_number) << SOF_IRQ_NUM_SHIFT))

#ifdef CONFIG_IRQ_MAP /* @@ -57,22 +57,22 @@ * 3. CPU number. * 4. CPU interrupt number. */ -#define REEF_IRQ_NUMBER(_irq) \ - (((_irq) >> REEF_IRQ_NUM_SHIFT) & REEF_IRQ_NUM_MASK) -#define REEF_IRQ_LEVEL(_level) \ - (((_level) >> REEF_IRQ_LEVEL_SHIFT) & REEF_IRQ_LEVEL_MASK) -#define REEF_IRQ_BIT(_bit) \ - (((_bit) >> REEF_IRQ_BIT_SHIFT) & REEF_IRQ_BIT_MASK) -#define REEF_IRQ_CPU(_cpu) \ - (((_cpu) >> REEF_IRQ_CPU_SHIFT) & REEF_IRQ_CPU_MASK) +#define SOF_IRQ_NUMBER(_irq) \ + (((_irq) >> SOF_IRQ_NUM_SHIFT) & SOF_IRQ_NUM_MASK) +#define SOF_IRQ_LEVEL(_level) \ + (((_level) >> SOF_IRQ_LEVEL_SHIFT) & SOF_IRQ_LEVEL_MASK) +#define SOF_IRQ_BIT(_bit) \ + (((_bit) >> SOF_IRQ_BIT_SHIFT) & SOF_IRQ_BIT_MASK) +#define SOF_IRQ_CPU(_cpu) \ + (((_cpu) >> SOF_IRQ_CPU_SHIFT) & SOF_IRQ_CPU_MASK) #else /* * IRQs are directly mapped onto a single level, bit and level. */ -#define REEF_IRQ_NUMBER(_irq) (_irq) -#define REEF_IRQ_LEVEL(_level) 0 -#define REEF_IRQ_BIT(_bit) 0 -#define REEF_IRQ_CPU(_cpu) 0 +#define SOF_IRQ_NUMBER(_irq) (_irq) +#define SOF_IRQ_LEVEL(_level) 0 +#define SOF_IRQ_BIT(_bit) 0 +#define SOF_IRQ_CPU(_cpu) 0 #endif

#endif diff --git a/src/include/reef/interrupt.h b/src/include/sof/interrupt.h similarity index 95% rename from src/include/reef/interrupt.h rename to src/include/sof/interrupt.h index 33733ff..2dc8954 100644 --- a/src/include/reef/interrupt.h +++ b/src/include/sof/interrupt.h @@ -34,9 +34,9 @@ #include <stdint.h> #include <arch/interrupt.h> #include <platform/interrupt.h> -#include <reef/trace.h> -#include <reef/debug.h> -#include <reef/lock.h> +#include <sof/trace.h> +#include <sof/debug.h> +#include <sof/lock.h>

#define trace_irq(__e) trace_event(TRACE_CLASS_IRQ, __e) #define trace_irq_error(__e) trace_error(TRACE_CLASS_IRQ, __e) @@ -68,12 +68,12 @@ uint32_t interrupt_disable(uint32_t irq);

static inline void interrupt_set(int irq) { - arch_interrupt_set(REEF_IRQ_NUMBER(irq)); + arch_interrupt_set(SOF_IRQ_NUMBER(irq)); }

static inline void interrupt_clear(int irq) { - arch_interrupt_clear(REEF_IRQ_NUMBER(irq)); + arch_interrupt_clear(SOF_IRQ_NUMBER(irq)); }

static inline uint32_t interrupt_global_disable(void) diff --git a/src/include/reef/io.h b/src/include/sof/io.h similarity index 100% rename from src/include/reef/io.h rename to src/include/sof/io.h diff --git a/src/include/reef/ipc.h b/src/include/sof/ipc.h similarity index 96% rename from src/include/reef/ipc.h rename to src/include/sof/ipc.h index 58d1f29..2e1818d 100644 --- a/src/include/reef/ipc.h +++ b/src/include/sof/ipc.h @@ -33,16 +33,16 @@ #define __INCLUDE_IPC_H__

#include <stdint.h> -#include <reef/trace.h> -#include <reef/dai.h> -#include <reef/lock.h> +#include <sof/trace.h> +#include <sof/dai.h> +#include <sof/lock.h> #include <platform/platform.h> #include <uapi/ipc.h> -#include <reef/audio/pipeline.h> -#include <reef/audio/component.h> -#include <reef/dma-trace.h> +#include <sof/audio/pipeline.h> +#include <sof/audio/component.h> +#include <sof/dma-trace.h>

-struct reef; +struct sof; struct dai_config;

#define trace_ipc(__e) trace_event(TRACE_CLASS_IPC, __e) @@ -115,7 +115,7 @@ struct ipc { (ipc)->private;

-int ipc_init(struct reef *reef); +int ipc_init(struct sof *sof); int platform_ipc_init(struct ipc *ipc); void ipc_free(struct ipc *ipc);

diff --git a/src/include/reef/list.h b/src/include/sof/list.h similarity index 100% rename from src/include/reef/list.h rename to src/include/sof/list.h diff --git a/src/include/reef/lock.h b/src/include/sof/lock.h similarity index 98% rename from src/include/reef/lock.h rename to src/include/sof/lock.h index d5518c9..a6c9d14 100644 --- a/src/include/reef/lock.h +++ b/src/include/sof/lock.h @@ -28,7 +28,7 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com * Keyon Jie yang.jie@linux.intel.com * - * Simple spinlock implementation for Reef. + * Simple spinlock implementation for SOF. */

#ifndef __INCLUDE_LOCK__ @@ -39,8 +39,8 @@

#include <stdint.h> #include <arch/spinlock.h> -#include <reef/interrupt.h> -#include <reef/trace.h> +#include <sof/interrupt.h> +#include <sof/trace.h>

/* * Lock debugging provides a simple interface to debug deadlocks. The rmbox diff --git a/src/include/reef/mailbox.h b/src/include/sof/mailbox.h similarity index 99% rename from src/include/reef/mailbox.h rename to src/include/sof/mailbox.h index b237e44..59259a0 100644 --- a/src/include/reef/mailbox.h +++ b/src/include/sof/mailbox.h @@ -34,7 +34,7 @@ #include <platform/mailbox.h> #include <arch/cache.h> #include <stdint.h> -#include <reef/string.h> +#include <sof/string.h>

/* 4k should be enough for everyone ..... */ #define IPC_MAX_MAILBOX_BYTES 0x1000 diff --git a/src/include/reef/math/Makefile.am b/src/include/sof/math/Makefile.am similarity index 100% rename from src/include/reef/math/Makefile.am rename to src/include/sof/math/Makefile.am diff --git a/src/include/reef/math/numbers.h b/src/include/sof/math/numbers.h similarity index 100% rename from src/include/reef/math/numbers.h rename to src/include/sof/math/numbers.h diff --git a/src/include/reef/math/trig.h b/src/include/sof/math/trig.h similarity index 100% rename from src/include/reef/math/trig.h rename to src/include/sof/math/trig.h diff --git a/src/include/reef/notifier.h b/src/include/sof/notifier.h similarity index 96% rename from src/include/reef/notifier.h rename to src/include/sof/notifier.h index 1c42a60..82086c9 100644 --- a/src/include/reef/notifier.h +++ b/src/include/sof/notifier.h @@ -32,9 +32,9 @@ #define __INCLUDE_NOTIFIER__

#include <stdint.h> -#include <reef/list.h> +#include <sof/list.h>

-struct reef; +struct sof;

/* notifier general IDs */ #define NOTIFIER_ID_CPU_FREQ 0 @@ -52,6 +52,6 @@ void notifier_unregister(struct notifier *notifier);

void notifier_event(int id, int message, void *event_data);

-void init_system_notify(struct reef *reef); +void init_system_notify(struct sof *sof);

#endif diff --git a/src/include/reef/panic.h b/src/include/sof/panic.h similarity index 96% rename from src/include/reef/panic.h rename to src/include/sof/panic.h index 71df1b8..3efb659 100644 --- a/src/include/reef/panic.h +++ b/src/include/sof/panic.h @@ -31,10 +31,10 @@ #ifndef __INCLUDE_SOF_IPC_PANIC__ #define __INCLUDE_SOF_IPC_PANIC__

-#include <reef/reef.h> -#include <reef/mailbox.h> -#include <reef/interrupt.h> -#include <reef/trace.h> +#include <sof/sof.h> +#include <sof/mailbox.h> +#include <sof/interrupt.h> +#include <sof/trace.h> #include <platform/platform.h> #include <uapi/ipc.h> #include <stdint.h> diff --git a/src/include/reef/schedule.h b/src/include/sof/schedule.h similarity index 94% rename from src/include/reef/schedule.h rename to src/include/sof/schedule.h index 26b3a93..7e5b3b2 100644 --- a/src/include/reef/schedule.h +++ b/src/include/sof/schedule.h @@ -28,18 +28,18 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#ifndef __INCLUDE_REEF_SCHEDULE_H__ -#define __INCLUDE_REEF_SCHEDULE_H__ +#ifndef __INCLUDE_SOF_SCHEDULE_H__ +#define __INCLUDE_SOF_SCHEDULE_H__

#include <stdint.h> #include <stddef.h> #include <errno.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/work.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/work.h>

-struct reef; +struct sof;

/* task states */ #define TASK_STATE_INIT 0 @@ -107,6 +107,6 @@ static inline void schedule_task_config(struct task *task, uint16_t priority, task->core = core; }

-int scheduler_init(struct reef *reef); +int scheduler_init(struct sof *sof);

#endif diff --git a/src/include/reef/reef.h b/src/include/sof/sof.h similarity index 96% rename from src/include/reef/reef.h rename to src/include/sof/sof.h index e0df031..d1c6452 100644 --- a/src/include/reef/reef.h +++ b/src/include/sof/sof.h @@ -28,12 +28,12 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#ifndef __INCLUDE_REEF_REEF__ -#define __INCLUDE_REEF_REEF__ +#ifndef __INCLUDE_SOF_SOF__ +#define __INCLUDE_SOF_SOF__

#include <stdint.h> #include <stddef.h> -#include <arch/reef.h> +#include <arch/sof.h>

struct ipc; struct sa; @@ -57,7 +57,7 @@ void cmemcpy(void *dest, void *src, size_t size); #endif

/* general firmware context */ -struct reef { +struct sof { /* init data */ int argc; char **argv; diff --git a/src/include/reef/ssp.h b/src/include/sof/ssp.h similarity index 98% rename from src/include/reef/ssp.h rename to src/include/sof/ssp.h index 770d94c..c66f67b 100644 --- a/src/include/reef/ssp.h +++ b/src/include/sof/ssp.h @@ -31,12 +31,12 @@ #ifndef __INCLUDE_SSP__ #define __INCLUDE_SSP__

-#include <reef/dai.h> -#include <reef/io.h> -#include <reef/lock.h> -#include <reef/work.h> -#include <reef/trace.h> -#include <reef/wait.h> +#include <sof/dai.h> +#include <sof/io.h> +#include <sof/lock.h> +#include <sof/work.h> +#include <sof/trace.h> +#include <sof/wait.h>

#define BIT(x) (1 << (x))

diff --git a/src/include/reef/stream.h b/src/include/sof/stream.h similarity index 96% rename from src/include/reef/stream.h rename to src/include/sof/stream.h index ccf1f08..04fe2de 100644 --- a/src/include/reef/stream.h +++ b/src/include/sof/stream.h @@ -29,8 +29,8 @@ * Keyon Jie yang.jie@linux.intel.com */

-#ifndef __INCLUDE_REEF_STREAM__ -#define __INCLUDE_REEF_STREAM__ +#ifndef __INCLUDE_SOF_STREAM__ +#define __INCLUDE_SOF_STREAM__

#include <stdint.h> #include <platform/platform.h> diff --git a/src/include/reef/string.h b/src/include/sof/string.h similarity index 96% rename from src/include/reef/string.h rename to src/include/sof/string.h index 42f47c9..f4b1f24 100644 --- a/src/include/reef/string.h +++ b/src/include/sof/string.h @@ -28,8 +28,8 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#ifndef __INCLUDE_STRING_REEF__ -#define __INCLUDE_STRING_REEF__ +#ifndef __INCLUDE_STRING_SOF__ +#define __INCLUDE_STRING_SOF__

#include <arch/string.h>

diff --git a/src/include/reef/task.h b/src/include/sof/task.h similarity index 97% rename from src/include/reef/task.h rename to src/include/sof/task.h index 0158f3f..00df473 100644 --- a/src/include/reef/task.h +++ b/src/include/sof/task.h @@ -31,8 +31,8 @@ #ifndef __INCLUDE_TASK_H__ #define __INCLUDE_TASK_H__

-struct reef; +struct sof;

-int do_task(struct reef *reef); +int do_task(struct sof *sof);

#endif diff --git a/src/include/reef/test b/src/include/sof/test similarity index 100% rename from src/include/reef/test rename to src/include/sof/test diff --git a/src/include/reef/timer.h b/src/include/sof/timer.h similarity index 100% rename from src/include/reef/timer.h rename to src/include/sof/timer.h diff --git a/src/include/reef/trace.h b/src/include/sof/trace.h similarity index 97% rename from src/include/reef/trace.h rename to src/include/sof/trace.h index 4c3157d..5409a1f 100644 --- a/src/include/reef/trace.h +++ b/src/include/sof/trace.h @@ -34,10 +34,10 @@

#include <stdint.h> #include <stdlib.h> -#include <reef/reef.h> -#include <reef/mailbox.h> -#include <reef/debug.h> -#include <reef/timer.h> +#include <sof/sof.h> +#include <sof/mailbox.h> +#include <sof/debug.h> +#include <sof/timer.h> #include <platform/platform.h> #include <platform/timer.h>

@@ -108,7 +108,7 @@ void _trace_event_atomic(uint32_t event); void _trace_event_mbox_atomic(uint32_t event); void trace_flush(void); void trace_off(void); -void trace_init(struct reef *reef); +void trace_init(struct sof *sof);

#if TRACE

diff --git a/src/include/reef/wait.h b/src/include/sof/wait.h similarity index 96% rename from src/include/reef/wait.h rename to src/include/sof/wait.h index e9737ec..b7725b8 100644 --- a/src/include/reef/wait.h +++ b/src/include/sof/wait.h @@ -36,12 +36,12 @@ #include <stdint.h> #include <errno.h> #include <arch/wait.h> -#include <reef/debug.h> -#include <reef/work.h> -#include <reef/timer.h> -#include <reef/interrupt.h> -#include <reef/trace.h> -#include <reef/lock.h> +#include <sof/debug.h> +#include <sof/work.h> +#include <sof/timer.h> +#include <sof/interrupt.h> +#include <sof/trace.h> +#include <sof/lock.h> #include <platform/interrupt.h>

#if DEBUG_LOCKS diff --git a/src/include/reef/work.h b/src/include/sof/work.h similarity index 98% rename from src/include/reef/work.h rename to src/include/sof/work.h index 0cdb085..a4493a7 100644 --- a/src/include/reef/work.h +++ b/src/include/sof/work.h @@ -35,8 +35,8 @@ #define __INCLUDE_WORK__

#include <stdint.h> -#include <reef/list.h> -#include <reef/timer.h> +#include <sof/list.h> +#include <sof/timer.h>

struct work_queue;

diff --git a/src/init/Makefile.am b/src/init/Makefile.am index d2f1d2d..a4641c6 100644 --- a/src/init/Makefile.am +++ b/src/init/Makefile.am @@ -6,5 +6,5 @@ libinit_a_SOURCES = \ libinit_a_CFLAGS = \ $(ARCH_CFLAGS) \ $(ARCH_INCDIR) \ - $(REEF_INCDIR) \ + $(SOF_INCDIR) \ $(PLATFORM_INCDIR) diff --git a/src/init/init.c b/src/init/init.c index d847e11..73ba3be 100644 --- a/src/init/init.c +++ b/src/init/init.c @@ -32,20 +32,20 @@ */

#include <stddef.h> -#include <reef/init.h> -#include <reef/task.h> -#include <reef/debug.h> -#include <reef/panic.h> -#include <reef/alloc.h> -#include <reef/notifier.h> -#include <reef/work.h> -#include <reef/trace.h> -#include <reef/schedule.h> -#include <reef/dma-trace.h> +#include <sof/init.h> +#include <sof/task.h> +#include <sof/debug.h> +#include <sof/panic.h> +#include <sof/alloc.h> +#include <sof/notifier.h> +#include <sof/work.h> +#include <sof/trace.h> +#include <sof/schedule.h> +#include <sof/dma-trace.h> #include <platform/platform.h>

/* main firmware context */ -static struct reef reef; +static struct sof sof;

int main(int argc, char *argv[]) { @@ -54,36 +54,36 @@ int main(int argc, char *argv[]) trace_point(TRACE_BOOT_START);

/* setup context */ - reef.argc = argc; - reef.argv = argv; + sof.argc = argc; + sof.argv = argv;

/* init architecture */ trace_point(TRACE_BOOT_ARCH); - err = arch_init(&reef); + err = arch_init(&sof); if (err < 0) panic(SOF_IPC_PANIC_ARCH);

/* initialise system services */ trace_point(TRACE_BOOT_SYS_HEAP); - init_heap(&reef); + init_heap(&sof);

- trace_init(&reef); + trace_init(&sof);

trace_point(TRACE_BOOT_SYS_NOTE); - init_system_notify(&reef); + init_system_notify(&sof);

trace_point(TRACE_BOOT_SYS_SCHED); - scheduler_init(&reef); + scheduler_init(&sof);

/* init the platform */ - err = platform_init(&reef); + err = platform_init(&sof); if (err < 0) panic(SOF_IPC_PANIC_PLATFORM);

trace_point(TRACE_BOOT_PLATFORM);

/* should not return */ - err = do_task(&reef); + err = do_task(&sof);

/* should never get here */ panic(SOF_IPC_PANIC_TASK); diff --git a/src/ipc/apl-ipc.c b/src/ipc/apl-ipc.c index 5665482..78291d0 100644 --- a/src/ipc/apl-ipc.c +++ b/src/ipc/apl-ipc.c @@ -29,28 +29,28 @@ * Keyon Jie yang.jie@linux.intel.com */

-#include <reef/debug.h> -#include <reef/timer.h> -#include <reef/interrupt.h> -#include <reef/ipc.h> -#include <reef/mailbox.h> -#include <reef/reef.h> -#include <reef/stream.h> -#include <reef/dai.h> -#include <reef/dma.h> -#include <reef/alloc.h> -#include <reef/wait.h> -#include <reef/trace.h> -#include <reef/ssp.h> +#include <sof/debug.h> +#include <sof/timer.h> +#include <sof/interrupt.h> +#include <sof/ipc.h> +#include <sof/mailbox.h> +#include <sof/sof.h> +#include <sof/stream.h> +#include <sof/dai.h> +#include <sof/dma.h> +#include <sof/alloc.h> +#include <sof/wait.h> +#include <sof/trace.h> +#include <sof/ssp.h> #include <platform/interrupt.h> #include <platform/mailbox.h> #include <platform/shim.h> #include <platform/dma.h> #include <platform/platform.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h> #include <uapi/ipc.h> -#include <reef/intel-ipc.h> +#include <sof/intel-ipc.h>

extern struct ipc *_ipc;

diff --git a/src/ipc/byt-ipc.c b/src/ipc/byt-ipc.c index 3ab6319..87e7949 100644 --- a/src/ipc/byt-ipc.c +++ b/src/ipc/byt-ipc.c @@ -29,28 +29,28 @@ * Keyon Jie yang.jie@linux.intel.com */

-#include <reef/debug.h> -#include <reef/timer.h> -#include <reef/interrupt.h> -#include <reef/ipc.h> -#include <reef/mailbox.h> -#include <reef/reef.h> -#include <reef/stream.h> -#include <reef/dai.h> -#include <reef/dma.h> -#include <reef/alloc.h> -#include <reef/wait.h> -#include <reef/trace.h> -#include <reef/ssp.h> +#include <sof/debug.h> +#include <sof/timer.h> +#include <sof/interrupt.h> +#include <sof/ipc.h> +#include <sof/mailbox.h> +#include <sof/sof.h> +#include <sof/stream.h> +#include <sof/dai.h> +#include <sof/dma.h> +#include <sof/alloc.h> +#include <sof/wait.h> +#include <sof/trace.h> +#include <sof/ssp.h> #include <platform/interrupt.h> #include <platform/mailbox.h> #include <platform/shim.h> #include <platform/dma.h> #include <platform/platform.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h> #include <uapi/ipc.h> -#include <reef/intel-ipc.h> +#include <sof/intel-ipc.h>

extern struct ipc *_ipc;

diff --git a/src/ipc/cnl-ipc.c b/src/ipc/cnl-ipc.c index 347cad2..ba65164 100644 --- a/src/ipc/cnl-ipc.c +++ b/src/ipc/cnl-ipc.c @@ -30,28 +30,28 @@ Rander Wang rander.wang@intel.com */

-#include <reef/debug.h> -#include <reef/timer.h> -#include <reef/interrupt.h> -#include <reef/ipc.h> -#include <reef/mailbox.h> -#include <reef/reef.h> -#include <reef/stream.h> -#include <reef/dai.h> -#include <reef/dma.h> -#include <reef/alloc.h> -#include <reef/wait.h> -#include <reef/trace.h> -#include <reef/ssp.h> +#include <sof/debug.h> +#include <sof/timer.h> +#include <sof/interrupt.h> +#include <sof/ipc.h> +#include <sof/mailbox.h> +#include <sof/sof.h> +#include <sof/stream.h> +#include <sof/dai.h> +#include <sof/dma.h> +#include <sof/alloc.h> +#include <sof/wait.h> +#include <sof/trace.h> +#include <sof/ssp.h> #include <platform/interrupt.h> #include <platform/mailbox.h> #include <platform/shim.h> #include <platform/dma.h> #include <platform/platform.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h> #include <uapi/ipc.h> -#include <reef/intel-ipc.h> +#include <sof/intel-ipc.h>

extern struct ipc *_ipc;

diff --git a/src/ipc/dma-copy.c b/src/ipc/dma-copy.c index ba7592a..be72eb8 100644 --- a/src/ipc/dma-copy.c +++ b/src/ipc/dma-copy.c @@ -31,12 +31,12 @@

#include <stdint.h> #include <uapi/ipc.h> -#include <reef/reef.h> -#include <reef/debug.h> -#include <reef/trace.h> -#include <reef/ipc.h> -#include <reef/dma.h> -#include <reef/wait.h> +#include <sof/sof.h> +#include <sof/debug.h> +#include <sof/trace.h> +#include <sof/ipc.h> +#include <sof/dma.h> +#include <sof/wait.h> #include <platform/dma.h>

/* tracing */ diff --git a/src/ipc/handler.c b/src/ipc/handler.c index 8dbe725..6a51765 100644 --- a/src/ipc/handler.c +++ b/src/ipc/handler.c @@ -34,29 +34,29 @@ * */

-#include <reef/debug.h> -#include <reef/timer.h> -#include <reef/interrupt.h> -#include <reef/ipc.h> -#include <reef/mailbox.h> -#include <reef/reef.h> -#include <reef/stream.h> -#include <reef/dai.h> -#include <reef/dma.h> -#include <reef/alloc.h> -#include <reef/wait.h> -#include <reef/trace.h> -#include <reef/ssp.h> +#include <sof/debug.h> +#include <sof/timer.h> +#include <sof/interrupt.h> +#include <sof/ipc.h> +#include <sof/mailbox.h> +#include <sof/sof.h> +#include <sof/stream.h> +#include <sof/dai.h> +#include <sof/dma.h> +#include <sof/alloc.h> +#include <sof/wait.h> +#include <sof/trace.h> +#include <sof/ssp.h> #include <platform/interrupt.h> #include <platform/mailbox.h> #include <platform/shim.h> #include <platform/dma.h> #include <platform/timer.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h> #include <uapi/ipc.h> -#include <reef/intel-ipc.h> -#include <reef/dma-trace.h> +#include <sof/intel-ipc.h> +#include <sof/dma-trace.h> #include <config.h>

#define iGS(x) ((x >> SOF_GLB_TYPE_SHIFT) & 0xf) diff --git a/src/ipc/hsw-ipc.c b/src/ipc/hsw-ipc.c index 489d6ef..aa4d9e1 100644 --- a/src/ipc/hsw-ipc.c +++ b/src/ipc/hsw-ipc.c @@ -28,29 +28,29 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#include <reef/debug.h> -#include <reef/timer.h> -#include <reef/interrupt.h> -#include <reef/ipc.h> -#include <reef/mailbox.h> -#include <reef/reef.h> -#include <reef/stream.h> -#include <reef/dai.h> -#include <reef/dma.h> -#include <reef/alloc.h> -#include <reef/wait.h> -#include <reef/trace.h> -#include <reef/ssp.h> +#include <sof/debug.h> +#include <sof/timer.h> +#include <sof/interrupt.h> +#include <sof/ipc.h> +#include <sof/mailbox.h> +#include <sof/sof.h> +#include <sof/stream.h> +#include <sof/dai.h> +#include <sof/dma.h> +#include <sof/alloc.h> +#include <sof/wait.h> +#include <sof/trace.h> +#include <sof/ssp.h> #include <platform/interrupt.h> #include <platform/mailbox.h> #include <platform/shim.h> #include <platform/dma.h> #include <platform/platform.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> -#include <reef/panic.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h> +#include <sof/panic.h> #include <uapi/ipc.h> -#include <reef/intel-ipc.h> +#include <sof/intel-ipc.h>

extern struct ipc *_ipc;

diff --git a/src/ipc/ipc.c b/src/ipc/ipc.c index a6ad21b..ed2cbb8 100644 --- a/src/ipc/ipc.c +++ b/src/ipc/ipc.c @@ -32,16 +32,16 @@ #include <stdint.h> #include <stddef.h> #include <errno.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/alloc.h> -#include <reef/ipc.h> -#include <reef/debug.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> -#include <reef/audio/buffer.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/alloc.h> +#include <sof/ipc.h> +#include <sof/debug.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h> +#include <sof/audio/buffer.h>

/* * Components, buffers and pipelines all use the same set of monotonic ID @@ -366,21 +366,21 @@ int ipc_comp_dai_config(struct ipc *ipc, struct sof_ipc_dai_config *config) return ret; }

-int ipc_init(struct reef *reef) +int ipc_init(struct sof *sof) { int i; trace_ipc("IPI");

/* init ipc data */ - reef->ipc = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*reef->ipc)); - reef->ipc->comp_data = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, - SOF_IPC_MSG_MAX_SIZE); - reef->ipc->dmat = reef->dmat; + sof->ipc = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*sof->ipc)); + sof->ipc->comp_data = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, + SOF_IPC_MSG_MAX_SIZE); + sof->ipc->dmat = sof->dmat;

for (i = 0; i < PLATFORM_MAX_STREAMS; i++) - reef->ipc->posn_map[i] = NULL; + sof->ipc->posn_map[i] = NULL;

- list_init(&reef->ipc->comp_list); + list_init(&sof->ipc->comp_list);

- return platform_ipc_init(reef->ipc); + return platform_ipc_init(sof->ipc); } diff --git a/src/ipc/pmc-ipc.c b/src/ipc/pmc-ipc.c index b99e368..9a30555 100644 --- a/src/ipc/pmc-ipc.c +++ b/src/ipc/pmc-ipc.c @@ -28,14 +28,14 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#include <reef/debug.h> -#include <reef/timer.h> -#include <reef/interrupt.h> -#include <reef/ipc.h> -#include <reef/reef.h> -#include <reef/alloc.h> -#include <reef/wait.h> -#include <reef/trace.h> +#include <sof/debug.h> +#include <sof/timer.h> +#include <sof/interrupt.h> +#include <sof/ipc.h> +#include <sof/sof.h> +#include <sof/alloc.h> +#include <sof/wait.h> +#include <sof/trace.h> #include <platform/interrupt.h> #include <platform/pmc.h> #include <platform/shim.h> diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index ea91904..825bfbd 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -14,5 +14,5 @@ libcore_a_SOURCES = \ libcore_a_CFLAGS = \ $(ARCH_CFLAGS) \ $(ARCH_INCDIR) \ - $(REEF_INCDIR) \ + $(SOF_INCDIR) \ $(PLATFORM_INCDIR) diff --git a/src/lib/agent.c b/src/lib/agent.c index 2c61cb1..b672f23 100644 --- a/src/lib/agent.c +++ b/src/lib/agent.c @@ -34,13 +34,13 @@ * continuously then the SA will emit trace and panic(). */

-#include <reef/reef.h> -#include <reef/agent.h> -#include <reef/debug.h> -#include <reef/panic.h> -#include <reef/alloc.h> -#include <reef/clock.h> -#include <reef/trace.h> +#include <sof/sof.h> +#include <sof/agent.h> +#include <sof/debug.h> +#include <sof/panic.h> +#include <sof/alloc.h> +#include <sof/clock.h> +#include <sof/trace.h> #include <platform/timer.h> #include <platform/platform.h> #include <platform/clk.h> @@ -51,9 +51,9 @@ /* * Notify the SA that we are about to enter idle state (WFI). */ -void sa_enter_idle(struct reef *reef) +void sa_enter_idle(struct sof *sof) { - struct sa *sa = reef->sa; + struct sa *sa = sof->sa;

sa->last_idle = platform_timer_get(platform_timer); } @@ -77,14 +77,14 @@ static uint64_t validate(void *data, uint64_t delay) return PLATFORM_IDLE_TIME; }

-void sa_init(struct reef *reef) +void sa_init(struct sof *sof) { struct sa *sa;

trace_sa("ini");

sa = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(*sa)); - reef->sa = sa; + sof->sa = sa;

/* set default tick timout */ sa->ticks = clock_us_to_ticks(PLATFORM_WORKQ_CLOCK, PLATFORM_IDLE_TIME); diff --git a/src/lib/alloc.c b/src/lib/alloc.c index 4803456..3ca14c3 100644 --- a/src/lib/alloc.c +++ b/src/lib/alloc.c @@ -29,12 +29,12 @@ * Keyon Jie yang.jie@linux.intel.com */

-#include <reef/alloc.h> -#include <reef/reef.h> -#include <reef/debug.h> -#include <reef/panic.h> -#include <reef/trace.h> -#include <reef/lock.h> +#include <sof/alloc.h> +#include <sof/sof.h> +#include <sof/debug.h> +#include <sof/panic.h> +#include <sof/trace.h> +#include <sof/lock.h> #include <platform/memory.h> #include <stdint.h>

@@ -589,7 +589,7 @@ int mm_pm_context_restore(struct dma_copy *dc, struct dma_sg_config *sg) }

/* initialise map */ -void init_heap(struct reef *reef) +void init_heap(struct sof *sof) { struct mm_heap *heap; struct block_map *next_map; diff --git a/src/lib/dma-trace.c b/src/lib/dma-trace.c index d7ad3d2..01a9925 100644 --- a/src/lib/dma-trace.c +++ b/src/lib/dma-trace.c @@ -28,16 +28,16 @@ * Author: Yan Wang yan.wang@linux.intel.com */

-#include <reef/trace.h> -#include <reef/dma-trace.h> -#include <reef/ipc.h> -#include <reef/reef.h> -#include <reef/alloc.h> +#include <sof/trace.h> +#include <sof/dma-trace.h> +#include <sof/ipc.h> +#include <sof/sof.h> +#include <sof/alloc.h> #include <arch/cache.h> #include <platform/timer.h> #include <platform/dma.h> #include <platform/platform.h> -#include <reef/lock.h> +#include <sof/lock.h> #include <stdint.h>

static struct dma_trace_data *trace_data = NULL; @@ -141,7 +141,7 @@ out: return DMA_TRACE_PERIOD; }

-int dma_trace_init_early(struct reef *reef) +int dma_trace_init_early(struct sof *sof) { struct dma_trace_buf *buffer;

@@ -167,7 +167,7 @@ int dma_trace_init_early(struct reef *reef)

list_init(&trace_data->config.elem_list); spinlock_init(&trace_data->lock); - reef->dmat = trace_data; + sof->dmat = trace_data;

return 0; } diff --git a/src/lib/interrupt.c b/src/lib/interrupt.c index 58ab6ae..e8e2899 100644 --- a/src/lib/interrupt.c +++ b/src/lib/interrupt.c @@ -30,9 +30,9 @@ * */

-#include <reef/interrupt.h> -#include <reef/interrupt-map.h> -#include <reef/alloc.h> +#include <sof/interrupt.h> +#include <sof/interrupt-map.h> +#include <sof/alloc.h> #include <arch/interrupt.h> #include <platform/interrupt.h> #include <stdint.h> @@ -49,18 +49,18 @@ int irq_register_child(struct irq_parent *parent, int irq, spin_lock(&parent->lock);

/* does child already exist ? */ - if (parent->child[REEF_IRQ_BIT(irq)]) { + if (parent->child[SOF_IRQ_BIT(irq)]) { /* already registered, return */ goto finish; }

/* init child */ - parent->child[REEF_IRQ_BIT(irq)] = + parent->child[SOF_IRQ_BIT(irq)] = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, sizeof(struct irq_child)); - parent->child[REEF_IRQ_BIT(irq)]->enabled = 0; - parent->child[REEF_IRQ_BIT(irq)]->handler = handler; - parent->child[REEF_IRQ_BIT(irq)]->handler_arg = arg; + parent->child[SOF_IRQ_BIT(irq)]->enabled = 0; + parent->child[SOF_IRQ_BIT(irq)]->handler = handler; + parent->child[SOF_IRQ_BIT(irq)]->handler_arg = arg;

/* do we need to register parent ? */ if (parent->num_children == 0) { @@ -82,13 +82,13 @@ void irq_unregister_child(struct irq_parent *parent, int irq) spin_lock(&parent->lock);

/* does child already exist ? */ - if (!parent->child[REEF_IRQ_BIT(irq)]) + if (!parent->child[SOF_IRQ_BIT(irq)]) goto finish;

/* free child */ parent->num_children -= 1; - rfree(parent->child[REEF_IRQ_BIT(irq)]); - parent->child[REEF_IRQ_BIT(irq)] = NULL; + rfree(parent->child[SOF_IRQ_BIT(irq)]); + parent->child[SOF_IRQ_BIT(irq)] = NULL;

/* * unregister the root interrupt if the this l2 is @@ -107,7 +107,7 @@ uint32_t irq_enable_child(struct irq_parent *parent, int irq)

spin_lock(&parent->lock);

- child = parent->child[REEF_IRQ_BIT(irq)]; + child = parent->child[SOF_IRQ_BIT(irq)];

/* already enabled ? */ if (child->enabled) @@ -115,7 +115,7 @@ uint32_t irq_enable_child(struct irq_parent *parent, int irq)

/* enable the parent interrupt */ if (parent->enabled_count == 0) - arch_interrupt_enable_mask(1 << REEF_IRQ_NUMBER(irq)); + arch_interrupt_enable_mask(1 << SOF_IRQ_NUMBER(irq)); child->enabled = 1; parent->enabled_count++;

@@ -134,7 +134,7 @@ uint32_t irq_disable_child(struct irq_parent *parent, int irq)

spin_lock(&parent->lock);

- child = parent->child[REEF_IRQ_BIT(irq)]; + child = parent->child[SOF_IRQ_BIT(irq)];

/* already disabled ? */ if (!child->enabled) @@ -147,7 +147,7 @@ uint32_t irq_disable_child(struct irq_parent *parent, int irq) /* disable the parent interrupt */ parent->enabled_count--; if (parent->enabled_count == 0) - arch_interrupt_disable_mask(1 << REEF_IRQ_NUMBER(irq)); + arch_interrupt_disable_mask(1 << SOF_IRQ_NUMBER(irq));

finish: spin_unlock(&parent->lock); diff --git a/src/lib/lib.c b/src/lib/lib.c index 7e4c09d..5aa194c 100644 --- a/src/lib/lib.c +++ b/src/lib/lib.c @@ -30,8 +30,8 @@

#include <stdint.h> #include <stdlib.h> -#include <reef/reef.h> -#include <reef/alloc.h> +#include <sof/sof.h> +#include <sof/alloc.h>

#if 0 // TODO: only compile if no arch memcpy is available.

diff --git a/src/lib/notifier.c b/src/lib/notifier.c index 888473e..8a8068b 100644 --- a/src/lib/notifier.c +++ b/src/lib/notifier.c @@ -28,10 +28,10 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#include <reef/notifier.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> +#include <sof/notifier.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h>

/* General purpose notifiers */

@@ -78,7 +78,7 @@ out: spin_unlock(&_notify.lock); }

-void init_system_notify(struct reef *reef) +void init_system_notify(struct sof *sof) { list_init(&_notify.list); spinlock_init(&_notify.lock); diff --git a/src/lib/schedule.c b/src/lib/schedule.c index c21d222..b98934d 100644 --- a/src/lib/schedule.c +++ b/src/lib/schedule.c @@ -31,19 +31,19 @@ #include <stdint.h> #include <stddef.h> #include <errno.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/list.h> -#include <reef/stream.h> -#include <reef/alloc.h> -#include <reef/debug.h> -#include <reef/clock.h> -#include <reef/schedule.h> -#include <reef/work.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/list.h> +#include <sof/stream.h> +#include <sof/alloc.h> +#include <sof/debug.h> +#include <sof/clock.h> +#include <sof/schedule.h> +#include <sof/work.h> #include <platform/timer.h> #include <platform/clk.h> -#include <reef/audio/component.h> -#include <reef/audio/pipeline.h> +#include <sof/audio/component.h> +#include <sof/audio/pipeline.h> #include <arch/task.h>

struct schedule_data { @@ -365,7 +365,7 @@ schedule: }

/* Initialise the scheduler */ -int scheduler_init(struct reef *reef) +int scheduler_init(struct sof *sof) { trace_pipe("ScI");

diff --git a/src/lib/trace.c b/src/lib/trace.c index 5f3ba8a..0c37858 100644 --- a/src/lib/trace.c +++ b/src/lib/trace.c @@ -28,13 +28,13 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#include <reef/trace.h> -#include <reef/reef.h> -#include <reef/alloc.h> +#include <sof/trace.h> +#include <sof/sof.h> +#include <sof/alloc.h> #include <arch/cache.h> #include <platform/timer.h> -#include <reef/lock.h> -#include <reef/dma-trace.h> +#include <sof/lock.h> +#include <sof/dma-trace.h> #include <stdint.h>

struct trace { @@ -152,9 +152,9 @@ void trace_off(void) trace.enable = 0; }

-void trace_init(struct reef *reef) +void trace_init(struct sof *sof) { - dma_trace_init_early(reef); + dma_trace_init_early(sof); trace.enable = 1; trace.pos = 0; spinlock_init(&trace.lock); diff --git a/src/lib/work.c b/src/lib/work.c index eb7b223..6b628b5 100644 --- a/src/lib/work.c +++ b/src/lib/work.c @@ -29,15 +29,15 @@ * Keyon Jie yang.jie@linux.intel.com */

-#include <reef/work.h> -#include <reef/timer.h> -#include <reef/list.h> -#include <reef/clock.h> -#include <reef/alloc.h> -#include <reef/reef.h> -#include <reef/lock.h> -#include <reef/notifier.h> -#include <reef/debug.h> +#include <sof/work.h> +#include <sof/timer.h> +#include <sof/list.h> +#include <sof/clock.h> +#include <sof/alloc.h> +#include <sof/sof.h> +#include <sof/lock.h> +#include <sof/notifier.h> +#include <sof/debug.h> #include <platform/clk.h> #include <platform/platform.h> #include <limits.h> diff --git a/src/library/include/platform/interrupt.h b/src/library/include/platform/interrupt.h index eb0fbfd..9586f77 100644 --- a/src/library/include/platform/interrupt.h +++ b/src/library/include/platform/interrupt.h @@ -32,7 +32,7 @@ #define __INCLUDE_PLATFORM_HOST_INTERRUPT__

#include <stdint.h> -#include <reef/interrupt-map.h> +#include <sof/interrupt-map.h>

/* IRQ numbers */ #define IRQ_NUM_SOFTWARE0 0 /* Level 1 */ diff --git a/src/library/include/platform/timer.h b/src/library/include/platform/timer.h index 3521e4c..9c6a513 100644 --- a/src/library/include/platform/timer.h +++ b/src/library/include/platform/timer.h @@ -33,7 +33,7 @@ #define __PLATFORM_HOST_TIMER_H__

#include <stdint.h> -#include <reef/timer.h> +#include <sof/timer.h> #include <platform/interrupt.h>

struct comp_dev; diff --git a/src/math/numbers.c b/src/math/numbers.c index 67492a0..d7a1717 100644 --- a/src/math/numbers.c +++ b/src/math/numbers.c @@ -35,7 +35,7 @@ * https://en.wikipedia.org/wiki/Euclidean_algorithm#Implementations */

-#include <reef/math/numbers.h> +#include <sof/math/numbers.h>

int gcd(int a, int b) { diff --git a/src/math/trig.c b/src/math/trig.c index 70593e4..47770a1 100644 --- a/src/math/trig.c +++ b/src/math/trig.c @@ -31,8 +31,8 @@ */

#include <stdint.h> -#include <reef/audio/format.h> -#include <reef/math/trig.h> +#include <sof/audio/format.h> +#include <sof/math/trig.h>

#define SINE_C_Q20 341782638 /* 2*SINE_NQUART/pi in Q12.20 */ diff --git a/src/platform/apollolake/Makefile.am b/src/platform/apollolake/Makefile.am index 7e776e3..8b441b8 100644 --- a/src/platform/apollolake/Makefile.am +++ b/src/platform/apollolake/Makefile.am @@ -14,7 +14,7 @@ libplatform_a_SOURCES = \ libplatform_a_CFLAGS = \ $(ARCH_CFLAGS) \ $(ARCH_INCDIR) \ - $(REEF_INCDIR) \ + $(SOF_INCDIR) \ $(PLATFORM_INCDIR)

noinst_PROGRAMS = module @@ -24,5 +24,5 @@ module_SOURCES = \

module_CFLAGS = \ $(ARCH_INCDIR) \ - $(REEF_INCDIR) \ + $(SOF_INCDIR) \ $(PLATFORM_INCDIR) diff --git a/src/platform/apollolake/apollolake.x.in b/src/platform/apollolake/apollolake.x.in index 5e95be1..76fbeb7 100644 --- a/src/platform/apollolake/apollolake.x.in +++ b/src/platform/apollolake/apollolake.x.in @@ -16,85 +16,85 @@ MEMORY { vector_reset_text : org = XCHAL_RESET_VECTOR0_PADDR, - len = REEF_MEM_RESET_TEXT_SIZE + len = SOF_MEM_RESET_TEXT_SIZE vector_reset_lit : - org = XCHAL_RESET_VECTOR0_PADDR + REEF_MEM_RESET_TEXT_SIZE, - len = REEF_MEM_RESET_LIT_SIZE + org = XCHAL_RESET_VECTOR0_PADDR + SOF_MEM_RESET_TEXT_SIZE, + len = SOF_MEM_RESET_LIT_SIZE vector_memory_lit : - org = XCHAL_MEMERROR_VECTOR_PADDR + REEF_MEM_ERROR_LIT_SIZE, - len = REEF_MEM_ERROR_LIT_SIZE + org = XCHAL_MEMERROR_VECTOR_PADDR + SOF_MEM_ERROR_LIT_SIZE, + len = SOF_MEM_ERROR_LIT_SIZE vector_memory_text : org = XCHAL_MEMERROR_VECTOR_PADDR, - len = REEF_MEM_ERROR_TEXT_SIZE + len = SOF_MEM_ERROR_TEXT_SIZE vector_base_text : org = XCHAL_VECBASE_RESET_PADDR, - len = REEF_MEM_VECBASE_LIT_SIZE + len = SOF_MEM_VECBASE_LIT_SIZE vector_int2_lit : - org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL2_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int2_text : org = XCHAL_INTLEVEL2_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int3_lit : - org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL3_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int3_text : org = XCHAL_INTLEVEL3_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int4_lit : - org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL4_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int4_text : org = XCHAL_INTLEVEL4_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int5_lit : - org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL5_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int5_text : org = XCHAL_INTLEVEL5_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int6_lit : - org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL6_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int6_text : org = XCHAL_INTLEVEL6_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int7_lit : - org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL7_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int7_text : org = XCHAL_INTLEVEL7_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_kernel_lit : - org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_KERNEL_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_kernel_text : org = XCHAL_KERNEL_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_user_lit : - org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_USER_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_user_text : org = XCHAL_USER_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_double_lit : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_DOUBLEEXC_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_double_text : org = XCHAL_DOUBLEEXC_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - reef_text_start : - org = REEF_TEXT_START, - len = REEF_TEXT_START_SIZE, - reef_text : - org = REEF_TEXT_BASE, - len = REEF_TEXT_SIZE, - reef_data : - org = REEF_TEXT_BASE + REEF_TEXT_SIZE, - len = REEF_DATA_SIZE - reef_bss_data : - org = REEF_TEXT_BASE + REEF_TEXT_SIZE + REEF_DATA_SIZE, - len = REEF_BSS_DATA_SIZE + len = SOF_MEM_VECT_TEXT_SIZE + sof_text_start : + org = SOF_TEXT_START, + len = SOF_TEXT_START_SIZE, + sof_text : + org = SOF_TEXT_BASE, + len = SOF_TEXT_SIZE, + sof_data : + org = SOF_TEXT_BASE + SOF_TEXT_SIZE, + len = SOF_DATA_SIZE + sof_bss_data : + org = SOF_TEXT_BASE + SOF_TEXT_SIZE + SOF_DATA_SIZE, + len = SOF_BSS_DATA_SIZE system_heap : org = HEAP_SYSTEM_BASE, len = HEAP_SYSTEM_SIZE @@ -104,9 +104,9 @@ MEMORY buffer_heap : org = HEAP_BUFFER_BASE, len = HEAP_BUFFER_SIZE - reef_stack : - org = REEF_STACK_END, - len = REEF_STACK_BASE - REEF_STACK_END + sof_stack : + org = SOF_STACK_END, + len = SOF_STACK_BASE - SOF_STACK_END }

PHDRS @@ -134,14 +134,14 @@ PHDRS vector_user_text_phdr PT_LOAD; vector_double_lit_phdr PT_LOAD; vector_double_text_phdr PT_LOAD; - reef_text_start_phdr PT_LOAD; - reef_text_phdr PT_LOAD; - reef_data_phdr PT_LOAD; - reef_bss_data_phdr PT_LOAD; + sof_text_start_phdr PT_LOAD; + sof_text_phdr PT_LOAD; + sof_data_phdr PT_LOAD; + sof_bss_data_phdr PT_LOAD; system_heap_phdr PT_LOAD; runtime_heap_phdr PT_LOAD; buffer_heap_phdr PT_LOAD; - reef_stack_phdr PT_LOAD; + sof_stack_phdr PT_LOAD; }

/* Default entry point: */ @@ -337,7 +337,7 @@ SECTIONS _ResetHandler_text_start = ABSOLUTE(.); KEEP (*(.ResetHandler.text)) _ResetHandler_text_end = ABSOLUTE(.); - } >reef_text_start :reef_text_start_phdr + } >sof_text_start :sof_text_start_phdr

.text : ALIGN(4) { @@ -352,7 +352,7 @@ SECTIONS *(.gnu.version) _text_end = ABSOLUTE(.); _etext = .; - } >reef_text :reef_text_phdr + } >sof_text :sof_text_phdr

.rodata : ALIGN(4) { @@ -390,7 +390,7 @@ SECTIONS LONG(_bss_end) _bss_table_end = ABSOLUTE(.); _rodata_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.data : ALIGN(4) { @@ -408,7 +408,7 @@ SECTIONS *(.gnu.linkonce.s2.*) KEEP(*(.jcr)) _data_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.lit4 : ALIGN(4) { @@ -417,7 +417,7 @@ SECTIONS *(.lit4.*) *(.gnu.linkonce.lit4.*) _lit4_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.bss (NOLOAD) : ALIGN(8) { @@ -438,13 +438,13 @@ SECTIONS *(COMMON) . = ALIGN (8); _bss_end = ABSOLUTE(.); - } >reef_bss_data :reef_bss_data_phdr + } >sof_bss_data :sof_bss_data_phdr

/* stack */ - _end = REEF_STACK_END; - PROVIDE(end = REEF_STACK_END); - _stack_sentry = REEF_STACK_END; - __stack = REEF_STACK_BASE; + _end = SOF_STACK_END; + PROVIDE(end = SOF_STACK_END); + _stack_sentry = SOF_STACK_END; + __stack = SOF_STACK_BASE;

/* System Heap */ _system_heap = HEAP_SYSTEM_BASE; @@ -532,11 +532,11 @@ SECTIONS _system_heap_end = ABSOLUTE(.); } >buffer_heap :buffer_heap_phdr

- .reef_stack (NOLOAD) : ALIGN(8) + .sof_stack (NOLOAD) : ALIGN(8) { . = ALIGN (4096); - _reef_stack_start = ABSOLUTE(.); - . = . + REEF_STACK_SIZE; - _reef_stack_end = ABSOLUTE(.); - } >reef_stack :reef_stack_phdr + _sof_stack_start = ABSOLUTE(.); + . = . + SOF_STACK_SIZE; + _sof_stack_end = ABSOLUTE(.); + } >sof_stack :sof_stack_phdr } diff --git a/src/platform/apollolake/base_module.c b/src/platform/apollolake/base_module.c index 141d7ba..38ec50f 100644 --- a/src/platform/apollolake/base_module.c +++ b/src/platform/apollolake/base_module.c @@ -41,14 +41,14 @@ struct sof_man_module_manifest apl_manifest = { .name = "BASEFW", .uuid = {0x2e, 0x9e, 0x86, 0xfc, 0xf8, 0x45, 0x45, 0x40, 0xa4, 0x16, 0x89, 0x88, 0x0a, 0xe3, 0x20, 0xa9}, - .entry_point = REEF_TEXT_START, + .entry_point = SOF_TEXT_START, .type = { .load_type = SOF_MAN_MOD_TYPE_MODULE, .domain_ll = 1, }, .affinity_mask = 3, }, - .text_size = REEF_TEXT_SIZE + L2_VECTOR_SIZE, + .text_size = SOF_TEXT_SIZE + L2_VECTOR_SIZE, };

/* not used, but stops linker complaining */ diff --git a/src/platform/apollolake/clk.c b/src/platform/apollolake/clk.c index 555caae..5eb8c4b 100644 --- a/src/platform/apollolake/clk.c +++ b/src/platform/apollolake/clk.c @@ -29,13 +29,13 @@ * Keyon Jie yang.jie@linux.intel.com */

-#include <reef/clock.h> -#include <reef/io.h> -#include <reef/reef.h> -#include <reef/list.h> -#include <reef/alloc.h> -#include <reef/notifier.h> -#include <reef/lock.h> +#include <sof/clock.h> +#include <sof/io.h> +#include <sof/sof.h> +#include <sof/list.h> +#include <sof/alloc.h> +#include <sof/notifier.h> +#include <sof/lock.h> #include <platform/clk.h> #include <platform/shim.h> #include <platform/timer.h> diff --git a/src/platform/apollolake/dai.c b/src/platform/apollolake/dai.c index 7c2aaa9..7e5da44 100644 --- a/src/platform/apollolake/dai.c +++ b/src/platform/apollolake/dai.c @@ -29,11 +29,11 @@ * Keyon Jie yang.jie@linux.intel.com */

-#include <reef/reef.h> -#include <reef/dai.h> -#include <reef/ssp.h> -#include <reef/stream.h> -#include <reef/audio/component.h> +#include <sof/sof.h> +#include <sof/dai.h> +#include <sof/ssp.h> +#include <sof/stream.h> +#include <sof/audio/component.h> #include <platform/platform.h> #include <platform/memory.h> #include <platform/interrupt.h> diff --git a/src/platform/apollolake/dma.c b/src/platform/apollolake/dma.c index 4a6c0ec..90dde96 100644 --- a/src/platform/apollolake/dma.c +++ b/src/platform/apollolake/dma.c @@ -29,9 +29,9 @@ * Keyon Jie yang.jie@linux.intel.com */

-#include <reef/dma.h> -#include <reef/dw-dma.h> -#include <reef/hda-dma.h> +#include <sof/dma.h> +#include <sof/dw-dma.h> +#include <sof/hda-dma.h> #include <platform/memory.h> #include <platform/interrupt.h> #include <platform/dma.h> diff --git a/src/platform/apollolake/include/platform/dma.h b/src/platform/apollolake/include/platform/dma.h index 497881a..916a455 100644 --- a/src/platform/apollolake/include/platform/dma.h +++ b/src/platform/apollolake/include/platform/dma.h @@ -33,7 +33,7 @@ #define __PLATFORM_DMA_H__

#include <stdint.h> -#include <reef/io.h> +#include <sof/io.h> #include <arch/cache.h>

/* available DMACs */ diff --git a/src/platform/apollolake/include/platform/interrupt.h b/src/platform/apollolake/include/platform/interrupt.h index 7c0208e..8e29deb 100644 --- a/src/platform/apollolake/include/platform/interrupt.h +++ b/src/platform/apollolake/include/platform/interrupt.h @@ -33,7 +33,7 @@ #define __INCLUDE_PLATFORM_INTERRUPT__

#include <stdint.h> -#include <reef/interrupt-map.h> +#include <sof/interrupt-map.h>

#define PLATFORM_IRQ_CHILDREN 32

@@ -89,55 +89,55 @@

/* Level 2 Peripheral IRQ mappings */ #define IRQ_EXT_HP_GPDMA_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_HP_GP_DMA0(0), 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_HP_GP_DMA0(0), 2, xcpu, IRQ_NUM_EXT_LEVEL2) #define IRQ_EXT_IDC_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_IDC, 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_IDC, 2, xcpu, IRQ_NUM_EXT_LEVEL2) #define IRQ_EXT_IPC_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_HOST_IPC, 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_HOST_IPC, 2, xcpu, IRQ_NUM_EXT_LEVEL2) #define IRQ_EXT_TSTAMP1_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_WALL_CLK1, 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_WALL_CLK1, 2, xcpu, IRQ_NUM_EXT_LEVEL2) #define IRQ_EXT_TSTAMP0_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_WALL_CLK0, 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_WALL_CLK0, 2, xcpu, IRQ_NUM_EXT_LEVEL2) #define IRQ_EXT_MERR_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_L2_MEMERR, 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_L2_MEMERR, 2, xcpu, IRQ_NUM_EXT_LEVEL2) #define IRQ_EXT_L2CACHE_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_L2_CACHE, 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_L2_CACHE, 2, xcpu, IRQ_NUM_EXT_LEVEL2) #define IRQ_EXT_SHA256_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_SHA256, 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_SHA256, 2, xcpu, IRQ_NUM_EXT_LEVEL2)

/* Level 3 Peripheral IRQ mappings */ #define IRQ_EXT_CODE_DMA_LVL3(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL3_CODE_LOADER, 3, xcpu, IRQ_NUM_EXT_LEVEL3) + SOF_IRQ(IRQ_BIT_LVL3_CODE_LOADER, 3, xcpu, IRQ_NUM_EXT_LEVEL3) #define IRQ_EXT_HOST_DMA_IN_LVL3(xcpu, channel) \ - REEF_IRQ(IRQ_BIT_LVL3_HOST_STREAM_IN(channel), 3, xcpu, IRQ_NUM_EXT_LEVEL3) + SOF_IRQ(IRQ_BIT_LVL3_HOST_STREAM_IN(channel), 3, xcpu, IRQ_NUM_EXT_LEVEL3) #define IRQ_EXT_HOST_DMA_OUT_LVL3(xcpu, channel) \ - REEF_IRQ(IRQ_BIT_LVL3_HOST_STREAM_OUT(channel), 3, xcpu, IRQ_NUM_EXT_LEVEL3) + SOF_IRQ(IRQ_BIT_LVL3_HOST_STREAM_OUT(channel), 3, xcpu, IRQ_NUM_EXT_LEVEL3)

/* Level 4 Peripheral IRQ mappings */ #define IRQ_EXT_LINK_DMA_IN_LVL4(xcpu, channel) \ - REEF_IRQ(IRQ_BIT_LVL4_LINK_STREAM_IN(channel), 4, xcpu, IRQ_NUM_EXT_LEVEL4) + SOF_IRQ(IRQ_BIT_LVL4_LINK_STREAM_IN(channel), 4, xcpu, IRQ_NUM_EXT_LEVEL4) #define IRQ_EXT_LINK_DMA_OUT_LVL4(xcpu, channel) \ - REEF_IRQ(IRQ_BIT_LVL4_LINK_STREAM_OUT(channel), 4, xcpu, IRQ_NUM_EXT_LEVEL4) + SOF_IRQ(IRQ_BIT_LVL4_LINK_STREAM_OUT(channel), 4, xcpu, IRQ_NUM_EXT_LEVEL4)

/* Level 5 Peripheral IRQ mappings */ #define IRQ_EXT_LP_GPDMA0_LVL5(xcpu, channel) \ - REEF_IRQ(IRQ_BIT_LVL5_LP_GP_DMA0(channel), 5, xcpu, IRQ_NUM_EXT_LEVEL5) + SOF_IRQ(IRQ_BIT_LVL5_LP_GP_DMA0(channel), 5, xcpu, IRQ_NUM_EXT_LEVEL5) #define IRQ_EXT_LP_GPDMA1_LVL5(xcpu, channel) \ - REEF_IRQ(IRQ_BIT_LVL5_LP_GP_DMA1(channel), 5, xcpu, IRQ_NUM_EXT_LEVEL5) + SOF_IRQ(IRQ_BIT_LVL5_LP_GP_DMA1(channel), 5, xcpu, IRQ_NUM_EXT_LEVEL5) #define IRQ_EXT_SSP0_LVL5(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL5_SSP(0), 5, xcpu, IRQ_NUM_EXT_LEVEL5) + SOF_IRQ(IRQ_BIT_LVL5_SSP(0), 5, xcpu, IRQ_NUM_EXT_LEVEL5) #define IRQ_EXT_SSP1_LVL5(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL5_SSP(1), 5, xcpu, IRQ_NUM_EXT_LEVEL5) + SOF_IRQ(IRQ_BIT_LVL5_SSP(1), 5, xcpu, IRQ_NUM_EXT_LEVEL5) #define IRQ_EXT_SSP2_LVL5(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL5_SSP(2), 5, xcpu, IRQ_NUM_EXT_LEVEL5) + SOF_IRQ(IRQ_BIT_LVL5_SSP(2), 5, xcpu, IRQ_NUM_EXT_LEVEL5) #define IRQ_EXT_SSP3_LVL5(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL5_SSP(3), 5, xcpu, IRQ_NUM_EXT_LEVEL5) + SOF_IRQ(IRQ_BIT_LVL5_SSP(3), 5, xcpu, IRQ_NUM_EXT_LEVEL5) #define IRQ_EXT_SSP4_LVL5(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL5_SSP(4), 5, xcpu, IRQ_NUM_EXT_LEVEL5) + SOF_IRQ(IRQ_BIT_LVL5_SSP(4), 5, xcpu, IRQ_NUM_EXT_LEVEL5) #define IRQ_EXT_SSP5_LVL5(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL5_SSP(5), 5, xcpu, IRQ_NUM_EXT_LEVEL5) + SOF_IRQ(IRQ_BIT_LVL5_SSP(5), 5, xcpu, IRQ_NUM_EXT_LEVEL5) #define IRQ_EXT_DMIC_LVL5(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL5_DMIC, 5, xcpu, IRQ_NUM_EXT_LEVEL5) + SOF_IRQ(IRQ_BIT_LVL5_DMIC, 5, xcpu, IRQ_NUM_EXT_LEVEL5)

/* IRQ Masks */ diff --git a/src/platform/apollolake/include/platform/memory.h b/src/platform/apollolake/include/platform/memory.h index ca3f15d..c71d8c6 100644 --- a/src/platform/apollolake/include/platform/memory.h +++ b/src/platform/apollolake/include/platform/memory.h @@ -132,7 +132,7 @@ * +--------------------------------------------------------------------------+ * | Offset | Region | Size | * +---------------------+----------------+-----------------------------------+ - * | L2_SRAM_BASE | RO Data | REEF_DATA_SIZE | + * | L2_SRAM_BASE | RO Data | SOF_DATA_SIZE | * | | Data | | * | | BSS | | * +---------------------+----------------+-----------------------------------+ @@ -142,9 +142,9 @@ * +---------------------+----------------+-----------------------------------+ * | HEAP_BUFFER_BASE | Module Buffers | HEAP_BUFFER_SIZE | * +---------------------+----------------+-----------------------------------+ - * | REEF_STACK_END | Stack | REEF_STACK_SIZE | + * | SOF_STACK_END | Stack | SOF_STACK_SIZE | * +---------------------+----------------+-----------------------------------+ - * | REEF_STACK_BASE | | | + * | SOF_STACK_BASE | | | * +---------------------+----------------+-----------------------------------+ */

@@ -163,23 +163,23 @@ #define HEAP_RT_COUNT1024 4

/* text and data share the same L2 SRAM on Broxton */ -#define REEF_TEXT_START L2_SRAM_BASE -#define REEF_TEXT_START_SIZE 0x400 +#define SOF_TEXT_START L2_SRAM_BASE +#define SOF_TEXT_START_SIZE 0x400 #define L2_VECTOR_SIZE 0x1000

-#define REEF_TEXT_BASE (L2_SRAM_BASE + L2_VECTOR_SIZE) -#define REEF_TEXT_SIZE 0x19000 +#define SOF_TEXT_BASE (L2_SRAM_BASE + L2_VECTOR_SIZE) +#define SOF_TEXT_SIZE 0x19000

/* initialized data */ -#define REEF_DATA_SIZE 0x18000 +#define SOF_DATA_SIZE 0x18000

/* bss data */ -#define REEF_BSS_DATA_SIZE 0x2800 +#define SOF_BSS_DATA_SIZE 0x2800

/* Heap configuration */ #define HEAP_SYSTEM_BASE \ - (REEF_TEXT_BASE + REEF_TEXT_SIZE +\ - REEF_DATA_SIZE + REEF_BSS_DATA_SIZE) + (SOF_TEXT_BASE + SOF_TEXT_SIZE +\ + SOF_DATA_SIZE + SOF_BSS_DATA_SIZE) #define HEAP_SYSTEM_SIZE 0x3200

#define HEAP_RUNTIME_BASE (HEAP_SYSTEM_BASE + HEAP_SYSTEM_SIZE) @@ -191,17 +191,17 @@

#define HEAP_BUFFER_BASE (HEAP_RUNTIME_BASE + HEAP_RUNTIME_SIZE) #define HEAP_BUFFER_SIZE \ - (L2_SRAM_SIZE - L2_VECTOR_SIZE - REEF_TEXT_SIZE - REEF_DATA_SIZE - \ - REEF_BSS_DATA_SIZE - HEAP_RUNTIME_SIZE - REEF_STACK_SIZE - HEAP_SYSTEM_SIZE) + (L2_SRAM_SIZE - L2_VECTOR_SIZE - SOF_TEXT_SIZE - SOF_DATA_SIZE - \ + SOF_BSS_DATA_SIZE - HEAP_RUNTIME_SIZE - SOF_STACK_SIZE - HEAP_SYSTEM_SIZE)

#define HEAP_BUFFER_BLOCK_SIZE 0x180 #define HEAP_BUFFER_COUNT (HEAP_BUFFER_SIZE / HEAP_BUFFER_BLOCK_SIZE)

/* Stack configuration */ -#define REEF_STACK_SIZE 0x1000 -#define REEF_STACK_BASE (L2_SRAM_BASE + L2_SRAM_SIZE) -#define REEF_STACK_END (REEF_STACK_BASE - REEF_STACK_SIZE) +#define SOF_STACK_SIZE 0x1000 +#define SOF_STACK_BASE (L2_SRAM_BASE + L2_SRAM_SIZE) +#define SOF_STACK_END (SOF_STACK_BASE - SOF_STACK_SIZE)

/* * The HP SRAM Region Apololake is organised like this :- @@ -295,7 +295,7 @@ * +--------------------------------------------------------------------------+ * | Offset | Region | Size | * +---------------------+----------------+-----------------------------------+ - * | LP_SRAM_BASE | RO Data | REEF_LP_DATA_SIZE | + * | LP_SRAM_BASE | RO Data | SOF_LP_DATA_SIZE | * | | Data | | * | | BSS | | * +---------------------+----------------+-----------------------------------+ @@ -305,9 +305,9 @@ * +---------------------+----------------+-----------------------------------+ * | HEAP_LP_BUFFER_BASE | Module Buffers | HEAP_LP_BUFFER_SIZE | * +---------------------+----------------+-----------------------------------+ - * | REEF_LP_STACK_END | Stack | REEF_LP_STACK_SIZE | + * | SOF_LP_STACK_END | Stack | SOF_LP_STACK_SIZE | * +---------------------+----------------+-----------------------------------+ - * | REEF_STACK_BASE | | | + * | SOF_STACK_BASE | | | * +---------------------+----------------+-----------------------------------+ */

@@ -326,9 +326,9 @@ #define HEAP_RT_LP_COUNT1024 4

/* Heap configuration */ -#define REEF_LP_DATA_SIZE 0x4000 +#define SOF_LP_DATA_SIZE 0x4000

-#define HEAP_LP_SYSTEM_BASE (LP_SRAM_BASE + REEF_LP_DATA_SIZE) +#define HEAP_LP_SYSTEM_BASE (LP_SRAM_BASE + SOF_LP_DATA_SIZE) #define HEAP_LP_SYSTEM_SIZE 0x1000

#define HEAP_LP_RUNTIME_BASE \ @@ -342,7 +342,7 @@ #define HEAP_LP_BUFFER_BASE \ (HEAP_LP_RUNTIME_BASE + HEAP_LP_RUNTIME_SIZE) #define HEAP_LP_BUFFER_SIZE \ - (LP_SRAM_SIZE - HEAP_LP_RUNTIME_SIZE - REEF_LP_STACK_SIZE - HEAP_LP_SYSTEM_SIZE) + (LP_SRAM_SIZE - HEAP_LP_RUNTIME_SIZE - SOF_LP_STACK_SIZE - HEAP_LP_SYSTEM_SIZE)

#define HEAP_LP_BUFFER_BLOCK_SIZE 0x180 #define HEAP_LP_BUFFER_COUNT \ @@ -352,21 +352,21 @@ #define PLATFORM_HEAP_BUFFER 3

/* Stack configuration */ -#define REEF_LP_STACK_SIZE 0x1000 -#define REEF_LP_STACK_BASE (LP_SRAM_BASE + LP_SRAM_SIZE) -#define REEF_LP_STACK_END (REEF_LP_STACK_BASE - REEF_LP_STACK_SIZE) +#define SOF_LP_STACK_SIZE 0x1000 +#define SOF_LP_STACK_BASE (LP_SRAM_BASE + LP_SRAM_SIZE) +#define SOF_LP_STACK_END (SOF_LP_STACK_BASE - SOF_LP_STACK_SIZE)

/* Vector and literal sizes - not in core-isa.h */ -#define REEF_MEM_VECT_LIT_SIZE 0x8 -#define REEF_MEM_VECT_TEXT_SIZE 0x38 -#define REEF_MEM_VECT_SIZE (REEF_MEM_VECT_TEXT_SIZE + REEF_MEM_VECT_LIT_SIZE) +#define SOF_MEM_VECT_LIT_SIZE 0x8 +#define SOF_MEM_VECT_TEXT_SIZE 0x38 +#define SOF_MEM_VECT_SIZE (SOF_MEM_VECT_TEXT_SIZE + SOF_MEM_VECT_LIT_SIZE)

-#define REEF_MEM_ERROR_TEXT_SIZE 0x180 -#define REEF_MEM_ERROR_LIT_SIZE 0x8 +#define SOF_MEM_ERROR_TEXT_SIZE 0x180 +#define SOF_MEM_ERROR_LIT_SIZE 0x8

-#define REEF_MEM_RESET_TEXT_SIZE 0x268 -#define REEF_MEM_RESET_LIT_SIZE 0x8 -#define REEF_MEM_VECBASE_LIT_SIZE 0x178 +#define SOF_MEM_RESET_TEXT_SIZE 0x268 +#define SOF_MEM_RESET_LIT_SIZE 0x8 +#define SOF_MEM_VECBASE_LIT_SIZE 0x178

-#define REEF_MEM_RO_SIZE 0x8 +#define SOF_MEM_RO_SIZE 0x8 #endif diff --git a/src/platform/apollolake/include/platform/platform.h b/src/platform/apollolake/include/platform/platform.h index 3a2d40b..8503ce2 100644 --- a/src/platform/apollolake/include/platform/platform.h +++ b/src/platform/apollolake/include/platform/platform.h @@ -36,7 +36,7 @@ #include <platform/interrupt.h> #include <uapi/ipc.h>

-struct reef; +struct sof;

/* Host page size */ #define HOST_PAGE_SIZE 4096 @@ -133,7 +133,7 @@ extern struct timer *platform_timer;

int platform_boot_complete(uint32_t boot_message);

-int platform_init(struct reef *reef); +int platform_init(struct sof *sof);

int platform_ssp_set_mn(uint32_t ssp_port, uint32_t source, uint32_t rate, uint32_t bclk_fs); diff --git a/src/platform/apollolake/include/platform/timer.h b/src/platform/apollolake/include/platform/timer.h index de7fa8b..e4977e4 100644 --- a/src/platform/apollolake/include/platform/timer.h +++ b/src/platform/apollolake/include/platform/timer.h @@ -33,7 +33,7 @@ #define __PLATFORM_TIMER_H__

#include <stdint.h> -#include <reef/timer.h> +#include <sof/timer.h> #include <platform/interrupt.h>

#define TIMER_COUNT 5 diff --git a/src/platform/apollolake/interrupt.c b/src/platform/apollolake/interrupt.c index 3f799b7..d4af079 100644 --- a/src/platform/apollolake/interrupt.c +++ b/src/platform/apollolake/interrupt.c @@ -30,9 +30,9 @@ * */

-#include <reef/reef.h> -#include <reef/interrupt.h> -#include <reef/interrupt-map.h> +#include <sof/sof.h> +#include <sof/interrupt.h> +#include <sof/interrupt-map.h> #include <arch/interrupt.h> #include <platform/interrupt.h> #include <platform/shim.h> @@ -221,7 +221,7 @@ static struct irq_parent dsp_irq[4] = {

struct irq_parent *platform_irq_get_parent(uint32_t irq) { - switch (REEF_IRQ_NUMBER(irq)) { + switch (SOF_IRQ_NUMBER(irq)) { case IRQ_NUM_EXT_LEVEL2: return &dsp_irq[0]; case IRQ_NUM_EXT_LEVEL3: @@ -243,18 +243,18 @@ uint32_t platform_interrupt_get_enabled(void) void platform_interrupt_mask(uint32_t irq, uint32_t mask) { /* mask external interrupt bit */ - switch (REEF_IRQ_NUMBER(irq)) { + switch (SOF_IRQ_NUMBER(irq)) { case IRQ_NUM_EXT_LEVEL5: - irq_write(REG_IRQ_IL5MSD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL5MSD(0), 1 << SOF_IRQ_BIT(irq)); break; case IRQ_NUM_EXT_LEVEL4: - irq_write(REG_IRQ_IL4MSD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL4MSD(0), 1 << SOF_IRQ_BIT(irq)); break; case IRQ_NUM_EXT_LEVEL3: - irq_write(REG_IRQ_IL3MSD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL3MSD(0), 1 << SOF_IRQ_BIT(irq)); break; case IRQ_NUM_EXT_LEVEL2: - irq_write(REG_IRQ_IL2MSD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL2MSD(0), 1 << SOF_IRQ_BIT(irq)); break; default: break; @@ -265,18 +265,18 @@ void platform_interrupt_mask(uint32_t irq, uint32_t mask) void platform_interrupt_unmask(uint32_t irq, uint32_t mask) { /* unmask external interrupt bit */ - switch (REEF_IRQ_NUMBER(irq)) { + switch (SOF_IRQ_NUMBER(irq)) { case IRQ_NUM_EXT_LEVEL5: - irq_write(REG_IRQ_IL5MCD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL5MCD(0), 1 << SOF_IRQ_BIT(irq)); break; case IRQ_NUM_EXT_LEVEL4: - irq_write(REG_IRQ_IL4MCD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL4MCD(0), 1 << SOF_IRQ_BIT(irq)); break; case IRQ_NUM_EXT_LEVEL3: - irq_write(REG_IRQ_IL3MCD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL3MCD(0), 1 << SOF_IRQ_BIT(irq)); break; case IRQ_NUM_EXT_LEVEL2: - irq_write(REG_IRQ_IL2MCD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL2MCD(0), 1 << SOF_IRQ_BIT(irq)); break; default: break; diff --git a/src/platform/apollolake/memory.c b/src/platform/apollolake/memory.c index aa3dfaa..775268d 100644 --- a/src/platform/apollolake/memory.c +++ b/src/platform/apollolake/memory.c @@ -28,7 +28,7 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#include <reef/alloc.h> +#include <sof/alloc.h>

/* Heap blocks for modules */ static struct block_hdr mod_block16[HEAP_RT_COUNT16]; diff --git a/src/platform/apollolake/platform.c b/src/platform/apollolake/platform.c index ce408da..d24a440 100644 --- a/src/platform/apollolake/platform.c +++ b/src/platform/apollolake/platform.c @@ -37,17 +37,17 @@ #include <platform/timer.h> #include <platform/interrupt.h> #include <uapi/ipc.h> -#include <reef/mailbox.h> -#include <reef/dai.h> -#include <reef/dma.h> -#include <reef/reef.h> -#include <reef/agent.h> -#include <reef/work.h> -#include <reef/clock.h> -#include <reef/ipc.h> -#include <reef/io.h> -#include <reef/trace.h> -#include <reef/audio/component.h> +#include <sof/mailbox.h> +#include <sof/dai.h> +#include <sof/dma.h> +#include <sof/sof.h> +#include <sof/agent.h> +#include <sof/work.h> +#include <sof/clock.h> +#include <sof/ipc.h> +#include <sof/io.h> +#include <sof/trace.h> +#include <sof/audio/component.h> #include <string.h> #include <version.h>

@@ -57,12 +57,12 @@ static const struct sof_ipc_fw_ready ready = { .size = sizeof(struct sof_ipc_fw_ready), }, .version = { - .build = REEF_BUILD, - .minor = REEF_MINOR, - .major = REEF_MAJOR, + .build = SOF_BUILD, + .minor = SOF_MINOR, + .major = SOF_MAJOR, .date = __DATE__, .time = __TIME__, - .tag = REEF_TAG, + .tag = SOF_TAG, }, };

@@ -184,7 +184,7 @@ static void platform_memory_windows_init(void) | DMWBA_READONLY | DMWBA_ENABLE); }

-int platform_init(struct reef *reef) +int platform_init(struct sof *sof) { struct dma *dmac; struct dai *ssp; @@ -208,7 +208,7 @@ int platform_init(struct reef *reef) init_system_workq(&platform_generic_queue);

/* init the system agent */ - sa_init(reef); + sa_init(sof);

/* Set CPU to default frequency for booting */ trace_point(TRACE_BOOT_SYS_CPU_FREQ); @@ -220,7 +220,7 @@ int platform_init(struct reef *reef)

/* initialise the host IPC mechanisms */ trace_point(TRACE_BOOT_PLATFORM_IPC); - ipc_init(reef); + ipc_init(sof);

/* disable PM for boot */ shim_write(SHIM_CLKCTL, shim_read(SHIM_CLKCTL) | @@ -272,7 +272,7 @@ int platform_init(struct reef *reef) }

/* Initialize DMA for Trace*/ - dma_trace_init_complete(reef->dmat); + dma_trace_init_complete(sof->dmat);

return 0; } diff --git a/src/platform/apollolake/timer.c b/src/platform/apollolake/timer.c index d7e5683..6c8d475 100644 --- a/src/platform/apollolake/timer.c +++ b/src/platform/apollolake/timer.c @@ -31,8 +31,8 @@

#include <platform/timer.h> #include <platform/shim.h> -#include <reef/debug.h> -#include <reef/audio/component.h> +#include <sof/debug.h> +#include <sof/audio/component.h> #include <stdint.h>

void platform_timer_start(struct timer *timer) diff --git a/src/platform/baytrail/Makefile.am b/src/platform/baytrail/Makefile.am index 571a957..22031d4 100644 --- a/src/platform/baytrail/Makefile.am +++ b/src/platform/baytrail/Makefile.am @@ -15,5 +15,5 @@ libplatform_a_SOURCES = \ libplatform_a_CFLAGS = \ $(ARCH_CFLAGS) \ $(ARCH_INCDIR) \ - $(REEF_INCDIR) \ + $(SOF_INCDIR) \ $(PLATFORM_INCDIR) diff --git a/src/platform/baytrail/baytrail.x.in b/src/platform/baytrail/baytrail.x.in index 6692cf7..0dd4505 100755 --- a/src/platform/baytrail/baytrail.x.in +++ b/src/platform/baytrail/baytrail.x.in @@ -16,76 +16,76 @@ MEMORY { vector_reset_text : org = XCHAL_RESET_VECTOR0_PADDR, - len = REEF_MEM_RESET_TEXT_SIZE + len = SOF_MEM_RESET_TEXT_SIZE vector_reset_lit : - org = XCHAL_RESET_VECTOR0_PADDR + REEF_MEM_RESET_TEXT_SIZE, - len = REEF_MEM_RESET_LIT_SIZE + org = XCHAL_RESET_VECTOR0_PADDR + SOF_MEM_RESET_TEXT_SIZE, + len = SOF_MEM_RESET_LIT_SIZE vector_base_text : org = XCHAL_VECBASE_RESET_PADDR, - len = REEF_MEM_VECBASE_LIT_SIZE + len = SOF_MEM_VECBASE_LIT_SIZE vector_int2_lit : - org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL2_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int2_text : org = XCHAL_INTLEVEL2_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int3_lit : - org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL3_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int3_text : org = XCHAL_INTLEVEL3_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int4_lit : - org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL4_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int4_text : org = XCHAL_INTLEVEL4_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int5_lit : - org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL5_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int5_text : org = XCHAL_INTLEVEL5_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int6_lit : - org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL6_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int6_text : org = XCHAL_INTLEVEL6_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int7_lit : - org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL7_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int7_text : org = XCHAL_INTLEVEL7_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_kernel_lit : - org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_KERNEL_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_kernel_text : org = XCHAL_KERNEL_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_user_lit : - org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_USER_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_user_text : org = XCHAL_USER_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_double_lit : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_DOUBLEEXC_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_double_text : org = XCHAL_DOUBLEEXC_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - reef_text_start : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR + REEF_MEM_VECT_SIZE, - len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_DOUBLEEXC_VECTOR_PADDR + REEF_MEM_VECT_SIZE) - reef_data_ro : + len = SOF_MEM_VECT_TEXT_SIZE + sof_text_start : + org = XCHAL_DOUBLEEXC_VECTOR_PADDR + SOF_MEM_VECT_SIZE, + len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_DOUBLEEXC_VECTOR_PADDR + SOF_MEM_VECT_SIZE) + sof_data_ro : org = DRAM0_BASE, - len = REEF_MEM_RO_SIZE - reef_data : - org = DRAM0_BASE + REEF_MEM_RO_SIZE, - len = HEAP_SYSTEM_BASE - (DRAM0_BASE + REEF_MEM_RO_SIZE) + len = SOF_MEM_RO_SIZE + sof_data : + org = DRAM0_BASE + SOF_MEM_RO_SIZE, + len = HEAP_SYSTEM_BASE - (DRAM0_BASE + SOF_MEM_RO_SIZE) system_heap : org = HEAP_SYSTEM_BASE, len = HEAP_SYSTEM_SIZE @@ -95,9 +95,9 @@ MEMORY buffer_heap : org = HEAP_BUFFER_BASE, len = HEAP_BUFFER_SIZE - reef_stack : - org = REEF_STACK_END, - len = REEF_STACK_BASE - REEF_STACK_END + sof_stack : + org = SOF_STACK_END, + len = SOF_STACK_BASE - SOF_STACK_END }

PHDRS @@ -124,14 +124,14 @@ PHDRS vector_user_lit_phdr PT_LOAD; vector_double_text_phdr PT_LOAD; vector_double_lit_phdr PT_LOAD; - reef_text_start_phdr PT_LOAD; - reef_data_ro_phdr PT_LOAD; - reef_data_phdr PT_LOAD; - reef_data_bss_phdr PT_LOAD; + sof_text_start_phdr PT_LOAD; + sof_data_ro_phdr PT_LOAD; + sof_data_phdr PT_LOAD; + sof_data_bss_phdr PT_LOAD; system_heap_phdr PT_LOAD; runtime_heap_phdr PT_LOAD; buffer_heap_phdr PT_LOAD; - reef_stack_phdr PT_LOAD; + sof_stack_phdr PT_LOAD; }

/* Default entry point: */ @@ -321,14 +321,14 @@ SECTIONS *(.gnu.version) _text_end = ABSOLUTE(.); _etext = .; - } >reef_text_start :reef_text_start_phdr + } >sof_text_start :sof_text_start_phdr

.reset.rodata : ALIGN(4) { _reset_rodata_start = ABSOLUTE(.); *(.reset.rodata) _reset_rodata_end = ABSOLUTE(.); - } >reef_data_ro :reef_data_ro_phdr + } >sof_data_ro :sof_data_ro_phdr

.rodata : ALIGN(4) { @@ -366,7 +366,7 @@ SECTIONS LONG(_bss_end) _bss_table_end = ABSOLUTE(.); _rodata_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.data : ALIGN(4) { @@ -384,7 +384,7 @@ SECTIONS *(.gnu.linkonce.s2.*) KEEP(*(.jcr)) _data_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.lit4 : ALIGN(4) { @@ -393,7 +393,7 @@ SECTIONS *(.lit4.*) *(.gnu.linkonce.lit4.*) _lit4_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.bss (NOLOAD) : ALIGN(8) { @@ -414,13 +414,13 @@ SECTIONS *(COMMON) . = ALIGN (8); _bss_end = ABSOLUTE(.); - } >reef_data :reef_data_bss_phdr + } >sof_data :sof_data_bss_phdr

/* stack */ - _end = REEF_STACK_END; - PROVIDE(end = REEF_STACK_END); - _stack_sentry = REEF_STACK_END; - __stack = REEF_STACK_BASE; + _end = SOF_STACK_END; + PROVIDE(end = SOF_STACK_END); + _stack_sentry = SOF_STACK_END; + __stack = SOF_STACK_BASE;

.debug 0 : { *(.debug) } .line 0 : { *(.line) } @@ -497,12 +497,12 @@ SECTIONS _system_heap_end = ABSOLUTE(.); } >buffer_heap :buffer_heap_phdr

- .reef_stack (NOLOAD) : ALIGN(8) + .sof_stack (NOLOAD) : ALIGN(8) { . = ALIGN (4096); - _reef_stack_start = ABSOLUTE(.); - . = . + REEF_STACK_SIZE; - _reef_stack_end = ABSOLUTE(.); - } >reef_stack :reef_stack_phdr + _sof_stack_start = ABSOLUTE(.); + . = . + SOF_STACK_SIZE; + _sof_stack_end = ABSOLUTE(.); + } >sof_stack :sof_stack_phdr }

diff --git a/src/platform/baytrail/clk.c b/src/platform/baytrail/clk.c index fc535ca..170aea8 100644 --- a/src/platform/baytrail/clk.c +++ b/src/platform/baytrail/clk.c @@ -29,13 +29,13 @@ * Keyon Jie yang.jie@linux.intel.com */

-#include <reef/clock.h> -#include <reef/io.h> -#include <reef/reef.h> -#include <reef/list.h> -#include <reef/alloc.h> -#include <reef/notifier.h> -#include <reef/lock.h> +#include <sof/clock.h> +#include <sof/io.h> +#include <sof/sof.h> +#include <sof/list.h> +#include <sof/alloc.h> +#include <sof/notifier.h> +#include <sof/lock.h> #include <platform/clk.h> #include <platform/shim.h> #include <platform/timer.h> diff --git a/src/platform/baytrail/dai.c b/src/platform/baytrail/dai.c index 6980540..9877e9d 100644 --- a/src/platform/baytrail/dai.c +++ b/src/platform/baytrail/dai.c @@ -28,11 +28,11 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#include <reef/reef.h> -#include <reef/dai.h> -#include <reef/ssp.h> -#include <reef/stream.h> -#include <reef/audio/component.h> +#include <sof/sof.h> +#include <sof/dai.h> +#include <sof/ssp.h> +#include <sof/stream.h> +#include <sof/audio/component.h> #include <platform/memory.h> #include <platform/interrupt.h> #include <platform/dma.h> diff --git a/src/platform/baytrail/dma.c b/src/platform/baytrail/dma.c index 6cb1fda..53602f5 100644 --- a/src/platform/baytrail/dma.c +++ b/src/platform/baytrail/dma.c @@ -28,8 +28,8 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#include <reef/dma.h> -#include <reef/dw-dma.h> +#include <sof/dma.h> +#include <sof/dw-dma.h> #include <platform/memory.h> #include <platform/interrupt.h> #include <platform/dma.h> diff --git a/src/platform/baytrail/include/platform/interrupt.h b/src/platform/baytrail/include/platform/interrupt.h index 650a797..9ea2c42 100644 --- a/src/platform/baytrail/include/platform/interrupt.h +++ b/src/platform/baytrail/include/platform/interrupt.h @@ -33,7 +33,7 @@

#include <stdint.h> #include <string.h> -#include <reef/interrupt-map.h> +#include <sof/interrupt-map.h>

/* IRQ numbers */ #define IRQ_NUM_SOFTWARE0 0 /* Level 1 */ diff --git a/src/platform/baytrail/include/platform/memory.h b/src/platform/baytrail/include/platform/memory.h index 5bf7141..4a5fb93 100644 --- a/src/platform/baytrail/include/platform/memory.h +++ b/src/platform/baytrail/include/platform/memory.h @@ -81,7 +81,7 @@ * +--------------------------------------------------------------------------+ * | Offset | Region | Size | * +---------------------+----------------+-----------------------------------+ - * | DRAM0_BASE | RO Data | REEF_DATA_SIZE | + * | DRAM0_BASE | RO Data | SOF_DATA_SIZE | * | | Data | | * | | BSS | | * +---------------------+----------------+-----------------------------------+ @@ -91,9 +91,9 @@ * +---------------------+----------------+-----------------------------------+ * | HEAP_BUFFER_BASE | Module Buffers | HEAP_BUFFER_SIZE | * +---------------------+----------------+-----------------------------------+ - * | REEF_STACK_END | Stack | REEF_STACK_SIZE | + * | SOF_STACK_END | Stack | SOF_STACK_SIZE | * +---------------------+----------------+-----------------------------------+ - * | REEF_STACK_BASE | | | + * | SOF_STACK_BASE | | | * +---------------------+----------------+-----------------------------------+ */

@@ -109,9 +109,9 @@ #define HEAP_RT_COUNT1024 4

/* Heap configuration */ -#define REEF_DATA_SIZE 0x6800 +#define SOF_DATA_SIZE 0x6800

-#define HEAP_SYSTEM_BASE (DRAM0_BASE + REEF_DATA_SIZE) +#define HEAP_SYSTEM_BASE (DRAM0_BASE + SOF_DATA_SIZE) #define HEAP_SYSTEM_SIZE 0x2000

#define HEAP_RUNTIME_BASE (HEAP_SYSTEM_BASE + HEAP_SYSTEM_SIZE) @@ -123,8 +123,8 @@

#define HEAP_BUFFER_BASE (HEAP_RUNTIME_BASE + HEAP_RUNTIME_SIZE) #define HEAP_BUFFER_SIZE \ - (DRAM0_SIZE - HEAP_RUNTIME_SIZE - REEF_STACK_SIZE -\ - HEAP_SYSTEM_SIZE - REEF_DATA_SIZE) + (DRAM0_SIZE - HEAP_RUNTIME_SIZE - SOF_STACK_SIZE -\ + HEAP_SYSTEM_SIZE - SOF_DATA_SIZE)

#define HEAP_BUFFER_BLOCK_SIZE 0x180 #define HEAP_BUFFER_COUNT (HEAP_BUFFER_SIZE / HEAP_BUFFER_BLOCK_SIZE) @@ -133,19 +133,19 @@ #define PLATFORM_HEAP_BUFFER 1

/* Stack configuration */ -#define REEF_STACK_SIZE 0x1000 -#define REEF_STACK_BASE (DRAM0_BASE + DRAM0_SIZE) -#define REEF_STACK_END (REEF_STACK_BASE - REEF_STACK_SIZE) +#define SOF_STACK_SIZE 0x1000 +#define SOF_STACK_BASE (DRAM0_BASE + DRAM0_SIZE) +#define SOF_STACK_END (SOF_STACK_BASE - SOF_STACK_SIZE)

/* Vector and literal sizes - not in core-isa.h */ -#define REEF_MEM_VECT_LIT_SIZE 0x4 -#define REEF_MEM_VECT_TEXT_SIZE 0x1c -#define REEF_MEM_VECT_SIZE (REEF_MEM_VECT_TEXT_SIZE + REEF_MEM_VECT_LIT_SIZE) +#define SOF_MEM_VECT_LIT_SIZE 0x4 +#define SOF_MEM_VECT_TEXT_SIZE 0x1c +#define SOF_MEM_VECT_SIZE (SOF_MEM_VECT_TEXT_SIZE + SOF_MEM_VECT_LIT_SIZE)

-#define REEF_MEM_RESET_TEXT_SIZE 0x2e0 -#define REEF_MEM_RESET_LIT_SIZE 0x120 -#define REEF_MEM_VECBASE_LIT_SIZE 0x178 +#define SOF_MEM_RESET_TEXT_SIZE 0x2e0 +#define SOF_MEM_RESET_LIT_SIZE 0x120 +#define SOF_MEM_VECBASE_LIT_SIZE 0x178

-#define REEF_MEM_RO_SIZE 0x8 +#define SOF_MEM_RO_SIZE 0x8

#endif diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index f3464f5..4d32d5e 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -36,7 +36,7 @@ #include <platform/interrupt.h> #include <uapi/ipc.h>

-struct reef; +struct sof;

/* IPC Interrupt */ #define PLATFORM_IPC_INTERUPT IRQ_NUM_EXT_IA @@ -115,6 +115,6 @@ struct reef;

int platform_boot_complete(uint32_t boot_message);

-int platform_init(struct reef *reef); +int platform_init(struct sof *sof);

#endif diff --git a/src/platform/baytrail/include/platform/timer.h b/src/platform/baytrail/include/platform/timer.h index a603f38..2801bb5 100644 --- a/src/platform/baytrail/include/platform/timer.h +++ b/src/platform/baytrail/include/platform/timer.h @@ -33,7 +33,7 @@ #define __PLATFORM_TIMER_H__

#include <stdint.h> -#include <reef/timer.h> +#include <sof/timer.h> #include <platform/interrupt.h>

#define TIMER_COUNT 4 diff --git a/src/platform/baytrail/memory.c b/src/platform/baytrail/memory.c index 12e7399..e1eb7cf 100644 --- a/src/platform/baytrail/memory.c +++ b/src/platform/baytrail/memory.c @@ -28,7 +28,7 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#include <reef/alloc.h> +#include <sof/alloc.h>

/* Heap blocks for modules */ static struct block_hdr mod_block16[HEAP_RT_COUNT16]; diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index 1917054..562fabf 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -37,18 +37,18 @@ #include <platform/timer.h> #include <platform/pmc.h> #include <uapi/ipc.h> -#include <reef/mailbox.h> -#include <reef/dai.h> -#include <reef/dma.h> -#include <reef/interrupt.h> -#include <reef/reef.h> -#include <reef/work.h> -#include <reef/clock.h> -#include <reef/ipc.h> -#include <reef/trace.h> -#include <reef/agent.h> -#include <reef/dma-trace.h> -#include <reef/audio/component.h> +#include <sof/mailbox.h> +#include <sof/dai.h> +#include <sof/dma.h> +#include <sof/interrupt.h> +#include <sof/sof.h> +#include <sof/work.h> +#include <sof/clock.h> +#include <sof/ipc.h> +#include <sof/trace.h> +#include <sof/agent.h> +#include <sof/dma-trace.h> +#include <sof/audio/component.h> #include <config.h> #include <string.h> #include <version.h> @@ -60,12 +60,12 @@ static const struct sof_ipc_fw_ready ready = { }, /* dspbox is for DSP initiated IPC, hostbox is for host initiated IPC */ .version = { - .build = REEF_BUILD, - .minor = REEF_MINOR, - .major = REEF_MAJOR, + .build = SOF_BUILD, + .minor = SOF_MINOR, + .major = SOF_MAJOR, .date = __DATE__, .time = __TIME__, - .tag = REEF_TAG, + .tag = SOF_TAG, }, /* TODO: add capabilities */ }; @@ -287,7 +287,7 @@ void platform_interrupt_unmask(uint32_t irq, uint32_t mask) } }

-int platform_init(struct reef *reef) +int platform_init(struct sof *sof) { #if defined CONFIG_BAYTRAIL struct dma *dmac0; @@ -339,7 +339,7 @@ int platform_init(struct reef *reef) platform_timer_start(platform_timer);

/* init the system agent */ - sa_init(reef); + sa_init(sof);

/* Set CPU to default frequency for booting */ trace_point(TRACE_BOOT_SYS_CPU_FREQ); @@ -352,7 +352,7 @@ int platform_init(struct reef *reef)

/* initialise the host IPC mechanisms */ trace_point(TRACE_BOOT_PLATFORM_IPC); - ipc_init(reef); + ipc_init(sof);

/* init DMACs */ trace_point(TRACE_BOOT_PLATFORM_DMA); @@ -416,7 +416,7 @@ int platform_init(struct reef *reef) #endif

/* Initialize DMA for Trace*/ - dma_trace_init_complete(reef->dmat); + dma_trace_init_complete(sof->dmat);

return 0; } diff --git a/src/platform/baytrail/timer.c b/src/platform/baytrail/timer.c index 8c205bc..835b2ee 100644 --- a/src/platform/baytrail/timer.c +++ b/src/platform/baytrail/timer.c @@ -33,8 +33,8 @@ #include <platform/timer.h> #include <platform/shim.h> #include <platform/interrupt.h> -#include <reef/debug.h> -#include <reef/audio/component.h> +#include <sof/debug.h> +#include <sof/audio/component.h> #include <stdint.h>

struct timer_data { diff --git a/src/platform/cannonlake/Makefile.am b/src/platform/cannonlake/Makefile.am index 2e9019d..3fe45ac 100644 --- a/src/platform/cannonlake/Makefile.am +++ b/src/platform/cannonlake/Makefile.am @@ -14,7 +14,7 @@ libplatform_a_SOURCES = \ libplatform_a_CFLAGS = \ $(ARCH_CFLAGS) \ $(ARCH_INCDIR) \ - $(REEF_INCDIR) \ + $(SOF_INCDIR) \ $(PLATFORM_INCDIR)

noinst_PROGRAMS = module boot_module @@ -24,7 +24,7 @@ module_SOURCES = \

module_CFLAGS = \ $(ARCH_INCDIR) \ - $(REEF_INCDIR) \ + $(SOF_INCDIR) \ $(PLATFORM_INCDIR)

boot_module_SOURCES = \ @@ -32,5 +32,5 @@ boot_module_SOURCES = \

boot_module_CFLAGS = \ $(ARCH_INCDIR) \ - $(REEF_INCDIR) \ + $(SOF_INCDIR) \ $(PLATFORM_INCDIR) \ No newline at end of file diff --git a/src/platform/cannonlake/base_module.c b/src/platform/cannonlake/base_module.c index ac1f873..9f3cb9c 100644 --- a/src/platform/cannonlake/base_module.c +++ b/src/platform/cannonlake/base_module.c @@ -41,7 +41,7 @@ struct sof_man_module_manifest cnl_manifest = { .name = "BASEFW", .uuid = {0x32, 0x8c, 0x39, 0x0e, 0xde, 0x5a, 0x4b, 0xba, 0x93, 0xb1, 0xc5, 0x04, 0x32, 0x28, 0x0e, 0xe4}, - .entry_point = REEF_TEXT_START, + .entry_point = SOF_TEXT_START, .type = { .load_type = SOF_MAN_MOD_TYPE_MODULE, .domain_ll = 1, diff --git a/src/platform/cannonlake/boot_ldr.x.in b/src/platform/cannonlake/boot_ldr.x.in index b85bfab..e15e631 100644 --- a/src/platform/cannonlake/boot_ldr.x.in +++ b/src/platform/cannonlake/boot_ldr.x.in @@ -20,70 +20,70 @@ MEMORY boot_entry_lit : org = IMR_BOOT_LDR_LIT_BASE, len = IMR_BOOT_LDR_LIT_SIZE - reef_text : + sof_text : org = IMR_BOOT_LDR_TEXT_BASE, len = IMR_BOOT_LDR_TEXT_SIZE, vector_base_text : org = XCHAL_VECBASE_RESET_PADDR, - len = REEF_MEM_VECBASE_LIT_SIZE + len = SOF_MEM_VECBASE_LIT_SIZE vector_int2_lit : - org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL2_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int2_text : org = XCHAL_INTLEVEL2_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int3_lit : - org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL3_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int3_text : org = XCHAL_INTLEVEL3_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int4_lit : - org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL4_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int4_text : org = XCHAL_INTLEVEL4_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int5_lit : - org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL5_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int5_text : org = XCHAL_INTLEVEL5_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int6_lit : - org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL6_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int6_text : org = XCHAL_INTLEVEL6_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int7_lit : - org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL7_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int7_text : org = XCHAL_INTLEVEL7_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_kernel_lit : - org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_KERNEL_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_kernel_text : org = XCHAL_KERNEL_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_user_lit : - org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_USER_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_user_text : org = XCHAL_USER_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_double_lit : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_DOUBLEEXC_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_double_text : org = XCHAL_DOUBLEEXC_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - reef_data : + len = SOF_MEM_VECT_TEXT_SIZE + sof_data : org = IMR_BOOT_LDR_DATA_BASE, len = IMR_BOOT_LDR_DATA_SIZE - reef_bss_data : + sof_bss_data : org = IMR_BOOT_LDR_BSS_BASE, len = IMR_BOOT_LDR_BSS_SIZE } @@ -92,7 +92,7 @@ PHDRS { boot_entry_text_phdr PT_LOAD; boot_entry_lit_phdr PT_LOAD; - reef_text_phdr PT_LOAD; + sof_text_phdr PT_LOAD; vector_base_text_phdr PT_LOAD; vector_int2_lit_phdr PT_LOAD; vector_int2_text_phdr PT_LOAD; @@ -112,8 +112,8 @@ PHDRS vector_user_text_phdr PT_LOAD; vector_double_lit_phdr PT_LOAD; vector_double_text_phdr PT_LOAD; - reef_data_phdr PT_LOAD; - reef_bss_data_phdr PT_LOAD; + sof_data_phdr PT_LOAD; + sof_bss_data_phdr PT_LOAD; }

/* Default entry point: */ @@ -153,7 +153,7 @@ SECTIONS KEEP (*(.MemoryExceptionVector.text)) _text_end = ABSOLUTE(.); _etext = .; - } >reef_text :reef_text_phdr + } >sof_text :sof_text_phdr

.WindowVectors.text : ALIGN(4) { @@ -324,7 +324,7 @@ SECTIONS LONG(_bss_end) _bss_table_end = ABSOLUTE(.); _rodata_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.data : ALIGN(4) { @@ -342,7 +342,7 @@ SECTIONS *(.gnu.linkonce.s2.*) KEEP(*(.jcr)) _data_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.lit4 : ALIGN(4) { @@ -351,7 +351,7 @@ SECTIONS *(.lit4.*) *(.gnu.linkonce.lit4.*) _lit4_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.bss (NOLOAD) : ALIGN(8) { @@ -372,7 +372,7 @@ SECTIONS *(COMMON) . = ALIGN (8); _bss_end = ABSOLUTE(.); - } >reef_bss_data :reef_bss_data_phdr + } >sof_bss_data :sof_bss_data_phdr

_man = 0x1234567;

diff --git a/src/platform/cannonlake/cannonlake.x.in b/src/platform/cannonlake/cannonlake.x.in index 2a52d67..052d637 100644 --- a/src/platform/cannonlake/cannonlake.x.in +++ b/src/platform/cannonlake/cannonlake.x.in @@ -16,85 +16,85 @@ MEMORY { vector_reset_text : org = XCHAL_RESET_VECTOR0_PADDR, - len = REEF_MEM_RESET_TEXT_SIZE + len = SOF_MEM_RESET_TEXT_SIZE vector_reset_lit : - org = XCHAL_RESET_VECTOR0_PADDR + REEF_MEM_RESET_TEXT_SIZE, - len = REEF_MEM_RESET_LIT_SIZE + org = XCHAL_RESET_VECTOR0_PADDR + SOF_MEM_RESET_TEXT_SIZE, + len = SOF_MEM_RESET_LIT_SIZE vector_memory_lit : - org = XCHAL_MEMERROR_VECTOR_PADDR + REEF_MEM_ERROR_LIT_SIZE, - len = REEF_MEM_ERROR_LIT_SIZE + org = XCHAL_MEMERROR_VECTOR_PADDR + SOF_MEM_ERROR_LIT_SIZE, + len = SOF_MEM_ERROR_LIT_SIZE vector_memory_text : org = XCHAL_MEMERROR_VECTOR_PADDR, - len = REEF_MEM_ERROR_TEXT_SIZE + len = SOF_MEM_ERROR_TEXT_SIZE vector_base_text : org = XCHAL_VECBASE_RESET_PADDR, - len = REEF_MEM_VECBASE_LIT_SIZE + len = SOF_MEM_VECBASE_LIT_SIZE vector_int2_lit : - org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL2_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int2_text : org = XCHAL_INTLEVEL2_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int3_lit : - org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL3_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int3_text : org = XCHAL_INTLEVEL3_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int4_lit : - org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL4_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int4_text : org = XCHAL_INTLEVEL4_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int5_lit : - org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL5_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int5_text : org = XCHAL_INTLEVEL5_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int6_lit : - org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL6_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int6_text : org = XCHAL_INTLEVEL6_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int7_lit : - org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL7_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int7_text : org = XCHAL_INTLEVEL7_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_kernel_lit : - org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_KERNEL_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_kernel_text : org = XCHAL_KERNEL_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_user_lit : - org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_USER_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_user_text : org = XCHAL_USER_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_double_lit : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_DOUBLEEXC_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_double_text : org = XCHAL_DOUBLEEXC_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - reef_text_start : - org = REEF_TEXT_START, - len = REEF_TEXT_START_SIZE, - reef_text : - org = REEF_TEXT_BASE, - len = REEF_TEXT_SIZE, - reef_data : - org = REEF_TEXT_BASE + REEF_TEXT_SIZE, - len = REEF_DATA_SIZE - reef_bss_data : - org = REEF_TEXT_BASE + REEF_TEXT_SIZE + REEF_DATA_SIZE, - len = REEF_BSS_DATA_SIZE + len = SOF_MEM_VECT_TEXT_SIZE + sof_text_start : + org = SOF_TEXT_START, + len = SOF_TEXT_START_SIZE, + sof_text : + org = SOF_TEXT_BASE, + len = SOF_TEXT_SIZE, + sof_data : + org = SOF_TEXT_BASE + SOF_TEXT_SIZE, + len = SOF_DATA_SIZE + sof_bss_data : + org = SOF_TEXT_BASE + SOF_TEXT_SIZE + SOF_DATA_SIZE, + len = SOF_BSS_DATA_SIZE system_heap : org = HEAP_SYSTEM_BASE, len = HEAP_SYSTEM_SIZE @@ -104,9 +104,9 @@ MEMORY buffer_heap : org = HEAP_BUFFER_BASE, len = HEAP_BUFFER_SIZE - reef_stack : - org = REEF_STACK_END, - len = REEF_STACK_BASE - REEF_STACK_END + sof_stack : + org = SOF_STACK_END, + len = SOF_STACK_BASE - SOF_STACK_END }

PHDRS @@ -134,14 +134,14 @@ PHDRS vector_user_text_phdr PT_LOAD; vector_double_lit_phdr PT_LOAD; vector_double_text_phdr PT_LOAD; - reef_text_start_phdr PT_LOAD; - reef_text_phdr PT_LOAD; - reef_data_phdr PT_LOAD; - reef_bss_data_phdr PT_LOAD; + sof_text_start_phdr PT_LOAD; + sof_text_phdr PT_LOAD; + sof_data_phdr PT_LOAD; + sof_bss_data_phdr PT_LOAD; system_heap_phdr PT_LOAD; runtime_heap_phdr PT_LOAD; buffer_heap_phdr PT_LOAD; - reef_stack_phdr PT_LOAD; + sof_stack_phdr PT_LOAD; }

/* Default entry point: */ @@ -337,7 +337,7 @@ SECTIONS _MainEntry_text_start = ABSOLUTE(.); KEEP (*(.MainEntry.text)) _MainEntry_text_end = ABSOLUTE(.); - } >reef_text_start :reef_text_start_phdr + } >sof_text_start :sof_text_start_phdr

.text : ALIGN(4) { @@ -353,7 +353,7 @@ SECTIONS KEEP (*(.ResetHandler.text)) _text_end = ABSOLUTE(.); _etext = .; - } >reef_text :reef_text_phdr + } >sof_text :sof_text_phdr

.rodata : ALIGN(4) { @@ -391,7 +391,7 @@ SECTIONS LONG(_bss_end) _bss_table_end = ABSOLUTE(.); _rodata_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.data : ALIGN(4) { @@ -409,7 +409,7 @@ SECTIONS *(.gnu.linkonce.s2.*) KEEP(*(.jcr)) _data_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.lit4 : ALIGN(4) { @@ -418,7 +418,7 @@ SECTIONS *(.lit4.*) *(.gnu.linkonce.lit4.*) _lit4_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.bss (NOLOAD) : ALIGN(8) { @@ -439,13 +439,13 @@ SECTIONS *(COMMON) . = ALIGN (8); _bss_end = ABSOLUTE(.); - } >reef_bss_data :reef_bss_data_phdr + } >sof_bss_data :sof_bss_data_phdr

/* stack */ - _end = REEF_STACK_END; - PROVIDE(end = REEF_STACK_END); - _stack_sentry = REEF_STACK_END; - __stack = REEF_STACK_BASE; + _end = SOF_STACK_END; + PROVIDE(end = SOF_STACK_END); + _stack_sentry = SOF_STACK_END; + __stack = SOF_STACK_BASE;

/* System Heap */ _system_heap = HEAP_SYSTEM_BASE; @@ -533,11 +533,11 @@ SECTIONS _system_heap_end = ABSOLUTE(.); } >buffer_heap :buffer_heap_phdr

- .reef_stack (NOLOAD) : ALIGN(8) + .sof_stack (NOLOAD) : ALIGN(8) { . = ALIGN (4096); - _reef_stack_start = ABSOLUTE(.); - . = . + REEF_STACK_SIZE; - _reef_stack_end = ABSOLUTE(.); - } >reef_stack :reef_stack_phdr + _sof_stack_start = ABSOLUTE(.); + . = . + SOF_STACK_SIZE; + _sof_stack_end = ABSOLUTE(.); + } >sof_stack :sof_stack_phdr } diff --git a/src/platform/cannonlake/clk.c b/src/platform/cannonlake/clk.c index 02cfc68..294f1d9 100644 --- a/src/platform/cannonlake/clk.c +++ b/src/platform/cannonlake/clk.c @@ -30,13 +30,13 @@ * Rander Wang rander.wang@intel.com */

-#include <reef/clock.h> -#include <reef/io.h> -#include <reef/reef.h> -#include <reef/list.h> -#include <reef/alloc.h> -#include <reef/notifier.h> -#include <reef/lock.h> +#include <sof/clock.h> +#include <sof/io.h> +#include <sof/sof.h> +#include <sof/list.h> +#include <sof/alloc.h> +#include <sof/notifier.h> +#include <sof/lock.h> #include <platform/clk.h> #include <platform/shim.h> #include <platform/timer.h> diff --git a/src/platform/cannonlake/dai.c b/src/platform/cannonlake/dai.c index 1ca5c29..6b2db36 100644 --- a/src/platform/cannonlake/dai.c +++ b/src/platform/cannonlake/dai.c @@ -30,11 +30,11 @@ * Rander Wang rander.wang@intel.com */

-#include <reef/reef.h> -#include <reef/dai.h> -#include <reef/ssp.h> -#include <reef/stream.h> -#include <reef/audio/component.h> +#include <sof/sof.h> +#include <sof/dai.h> +#include <sof/ssp.h> +#include <sof/stream.h> +#include <sof/audio/component.h> #include <platform/memory.h> #include <platform/interrupt.h> #include <platform/dma.h> diff --git a/src/platform/cannonlake/dma.c b/src/platform/cannonlake/dma.c index b77f1d2..b606d1e 100644 --- a/src/platform/cannonlake/dma.c +++ b/src/platform/cannonlake/dma.c @@ -30,9 +30,9 @@ * Rander Wang rander.wang@intel.com */

-#include <reef/dma.h> -#include <reef/dw-dma.h> -#include <reef/hda-dma.h> +#include <sof/dma.h> +#include <sof/dw-dma.h> +#include <sof/hda-dma.h> #include <platform/memory.h> #include <platform/interrupt.h> #include <platform/dma.h> diff --git a/src/platform/cannonlake/include/platform/interrupt.h b/src/platform/cannonlake/include/platform/interrupt.h index 0db0d99..03857a7 100644 --- a/src/platform/cannonlake/include/platform/interrupt.h +++ b/src/platform/cannonlake/include/platform/interrupt.h @@ -34,7 +34,7 @@ #define __INCLUDE_PLATFORM_INTERRUPT__

#include <stdint.h> -#include <reef/interrupt-map.h> +#include <sof/interrupt-map.h>

#define PLATFORM_IRQ_CHILDREN 32

@@ -90,51 +90,51 @@

/* Level 2 Peripheral IRQ mappings */ #define IRQ_EXT_HP_GPDMA_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_HP_GP_DMA0(0), 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_HP_GP_DMA0(0), 2, xcpu, IRQ_NUM_EXT_LEVEL2) #define IRQ_EXT_IDC_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_IDC, 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_IDC, 2, xcpu, IRQ_NUM_EXT_LEVEL2) #define IRQ_EXT_IPC_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_HOST_IPC, 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_HOST_IPC, 2, xcpu, IRQ_NUM_EXT_LEVEL2) #define IRQ_EXT_TSTAMP1_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_WALL_CLK1, 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_WALL_CLK1, 2, xcpu, IRQ_NUM_EXT_LEVEL2) #define IRQ_EXT_TSTAMP0_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_WALL_CLK0, 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_WALL_CLK0, 2, xcpu, IRQ_NUM_EXT_LEVEL2) #define IRQ_EXT_MERR_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_L2_MEMERR, 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_L2_MEMERR, 2, xcpu, IRQ_NUM_EXT_LEVEL2) #define IRQ_EXT_L2CACHE_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_L2_CACHE, 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_L2_CACHE, 2, xcpu, IRQ_NUM_EXT_LEVEL2) #define IRQ_EXT_SHA256_LVL2(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL2_SHA256, 2, xcpu, IRQ_NUM_EXT_LEVEL2) + SOF_IRQ(IRQ_BIT_LVL2_SHA256, 2, xcpu, IRQ_NUM_EXT_LEVEL2)

/* Level 3 Peripheral IRQ mappings */ #define IRQ_EXT_CODE_DMA_LVL3(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL3_CODE_LOADER, 3, xcpu, IRQ_NUM_EXT_LEVEL3) + SOF_IRQ(IRQ_BIT_LVL3_CODE_LOADER, 3, xcpu, IRQ_NUM_EXT_LEVEL3) #define IRQ_EXT_HOST_DMA_IN_LVL3(xcpu, channel) \ - REEF_IRQ(IRQ_BIT_LVL3_HOST_STREAM_IN(channel), 3, xcpu, IRQ_NUM_EXT_LEVEL3) + SOF_IRQ(IRQ_BIT_LVL3_HOST_STREAM_IN(channel), 3, xcpu, IRQ_NUM_EXT_LEVEL3) #define IRQ_EXT_HOST_DMA_OUT_LVL3(xcpu, channel) \ - REEF_IRQ(IRQ_BIT_LVL3_HOST_STREAM_OUT(channel), 3, xcpu, IRQ_NUM_EXT_LEVEL3) + SOF_IRQ(IRQ_BIT_LVL3_HOST_STREAM_OUT(channel), 3, xcpu, IRQ_NUM_EXT_LEVEL3)

/* Level 4 Peripheral IRQ mappings */ #define IRQ_EXT_LINK_DMA_IN_LVL4(xcpu, channel) \ - REEF_IRQ(IRQ_BIT_LVL4_LINK_STREAM_IN(channel), 4, xcpu, IRQ_NUM_EXT_LEVEL4) + SOF_IRQ(IRQ_BIT_LVL4_LINK_STREAM_IN(channel), 4, xcpu, IRQ_NUM_EXT_LEVEL4) #define IRQ_EXT_LINK_DMA_OUT_LVL4(xcpu, channel) \ - REEF_IRQ(IRQ_BIT_LVL4_LINK_STREAM_OUT(channel), 4, xcpu, IRQ_NUM_EXT_LEVEL4) + SOF_IRQ(IRQ_BIT_LVL4_LINK_STREAM_OUT(channel), 4, xcpu, IRQ_NUM_EXT_LEVEL4)

/* Level 5 Peripheral IRQ mappings */ #define IRQ_EXT_LP_GPDMA0_LVL5(xcpu, channel) \ - REEF_IRQ(IRQ_BIT_LVL5_LP_GP_DMA0, 5, xcpu, IRQ_NUM_EXT_LEVEL5) + SOF_IRQ(IRQ_BIT_LVL5_LP_GP_DMA0, 5, xcpu, IRQ_NUM_EXT_LEVEL5) #define IRQ_EXT_LP_GPDMA1_LVL4(xcpu, channel) \ - REEF_IRQ(IRQ_BIT_LVL5_LP_GP_DMA1, 4, xcpu, IRQ_NUM_EXT_LEVEL4) + SOF_IRQ(IRQ_BIT_LVL5_LP_GP_DMA1, 4, xcpu, IRQ_NUM_EXT_LEVEL4) #define IRQ_EXT_SSP0_LVL5(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL5_SSP(0), 5, xcpu, IRQ_NUM_EXT_LEVEL5) + SOF_IRQ(IRQ_BIT_LVL5_SSP(0), 5, xcpu, IRQ_NUM_EXT_LEVEL5) #define IRQ_EXT_SSP1_LVL5(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL5_SSP(1), 5, xcpu, IRQ_NUM_EXT_LEVEL5) + SOF_IRQ(IRQ_BIT_LVL5_SSP(1), 5, xcpu, IRQ_NUM_EXT_LEVEL5) #define IRQ_EXT_SSP2_LVL5(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL5_SSP(2), 5, xcpu, IRQ_NUM_EXT_LEVEL5) + SOF_IRQ(IRQ_BIT_LVL5_SSP(2), 5, xcpu, IRQ_NUM_EXT_LEVEL5) #define IRQ_EXT_SSP3_LVL5(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL5_SSP(3), 5, xcpu, IRQ_NUM_EXT_LEVEL5) + SOF_IRQ(IRQ_BIT_LVL5_SSP(3), 5, xcpu, IRQ_NUM_EXT_LEVEL5) #define IRQ_EXT_DMIC_LVL5(xcpu) \ - REEF_IRQ(IRQ_BIT_LVL5_DMIC, 5, xcpu, IRQ_NUM_EXT_LEVEL5) + SOF_IRQ(IRQ_BIT_LVL5_DMIC, 5, xcpu, IRQ_NUM_EXT_LEVEL5)

/* IRQ Masks */ diff --git a/src/platform/cannonlake/include/platform/memory.h b/src/platform/cannonlake/include/platform/memory.h index 64c4bbc..c7f4750 100644 --- a/src/platform/cannonlake/include/platform/memory.h +++ b/src/platform/cannonlake/include/platform/memory.h @@ -160,9 +160,9 @@ * +---------------------+----------------+-----------------------------------+ * | HEAP_BUFFER_BASE | Module Buffers | HEAP_BUFFER_SIZE | * +---------------------+----------------+-----------------------------------+ - * | REEF_STACK_END | Stack | REEF_STACK_SIZE | + * | SOF_STACK_END | Stack | SOF_STACK_SIZE | * +---------------------+----------------+-----------------------------------+ - * | REEF_STACK_BASE | | | + * | SOF_STACK_BASE | | | * +---------------------+----------------+-----------------------------------+ */

@@ -184,8 +184,8 @@ #define HEAP_RT_COUNT1024 4

/* text and data share the same L2 SRAM on Cannonlake */ -#define REEF_TEXT_START 0xBE040400 -#define REEF_TEXT_START_SIZE 0x40 +#define SOF_TEXT_START 0xBE040400 +#define SOF_TEXT_START_SIZE 0x40 #define L2_VECTOR_SIZE 0x1000

/* HP SRAM windows */ @@ -236,18 +236,18 @@ #define HEAP_HP_BUFFER_COUNT \ (HEAP_HP_BUFFER_SIZE / HEAP_HP_BUFFER_BLOCK_SIZE)

-#define REEF_TEXT_BASE (REEF_TEXT_START + REEF_TEXT_START_SIZE) -#define REEF_TEXT_SIZE 0x18000 +#define SOF_TEXT_BASE (SOF_TEXT_START + SOF_TEXT_START_SIZE) +#define SOF_TEXT_SIZE 0x18000

/* initialized data */ -#define REEF_DATA_SIZE 0x18000 +#define SOF_DATA_SIZE 0x18000

/* bss data */ -#define REEF_BSS_DATA_SIZE 0x8000 +#define SOF_BSS_DATA_SIZE 0x8000

/* Heap configuration */ -#define HEAP_SYSTEM_BASE (REEF_TEXT_BASE + REEF_TEXT_SIZE + \ - REEF_DATA_SIZE + REEF_BSS_DATA_SIZE) +#define HEAP_SYSTEM_BASE (SOF_TEXT_BASE + SOF_TEXT_SIZE + \ + SOF_DATA_SIZE + SOF_BSS_DATA_SIZE)

#define HEAP_SYSTEM_SIZE 0x8000

@@ -259,13 +259,13 @@ HEAP_RT_COUNT512 * 512 + HEAP_RT_COUNT1024 * 1024)

/* Stack configuration */ -#define REEF_STACK_SIZE 0x2000 -#define REEF_STACK_BASE (HP_SRAM_BASE + HP_SRAM_SIZE) -#define REEF_STACK_END (REEF_STACK_BASE - REEF_STACK_SIZE) +#define SOF_STACK_SIZE 0x2000 +#define SOF_STACK_BASE (HP_SRAM_BASE + HP_SRAM_SIZE) +#define SOF_STACK_END (SOF_STACK_BASE - SOF_STACK_SIZE)

#define HEAP_BUFFER_BASE (HEAP_RUNTIME_BASE + HEAP_RUNTIME_SIZE) #define HEAP_BUFFER_SIZE \ - (REEF_STACK_END - HEAP_BUFFER_BASE) + (SOF_STACK_END - HEAP_BUFFER_BASE) #define HEAP_BUFFER_BLOCK_SIZE 0x180 #define HEAP_BUFFER_COUNT (HEAP_BUFFER_SIZE / HEAP_BUFFER_BLOCK_SIZE)

@@ -275,7 +275,7 @@ * +--------------------------------------------------------------------------+ * | Offset | Region | Size | * +---------------------+----------------+-----------------------------------+ - * | LP_SRAM_BASE | RO Data | REEF_LP_DATA_SIZE | + * | LP_SRAM_BASE | RO Data | SOF_LP_DATA_SIZE | * | | Data | | * | | BSS | | * +---------------------+----------------+-----------------------------------+ @@ -285,9 +285,9 @@ * +---------------------+----------------+-----------------------------------+ * | HEAP_LP_BUFFER_BASE | Module Buffers | HEAP_LP_BUFFER_SIZE | * +---------------------+----------------+-----------------------------------+ - * | REEF_LP_STACK_END | Stack | REEF_LP_STACK_SIZE | + * | SOF_LP_STACK_END | Stack | SOF_LP_STACK_SIZE | * +---------------------+----------------+-----------------------------------+ - * | REEF_STACK_BASE | | | + * | SOF_STACK_BASE | | | * +---------------------+----------------+-----------------------------------+ */

@@ -306,9 +306,9 @@ #define HEAP_RT_LP_COUNT1024 4

/* Heap configuration */ -#define REEF_LP_DATA_SIZE 0x4000 +#define SOF_LP_DATA_SIZE 0x4000

-#define HEAP_LP_SYSTEM_BASE (LP_SRAM_BASE + REEF_LP_DATA_SIZE) +#define HEAP_LP_SYSTEM_BASE (LP_SRAM_BASE + SOF_LP_DATA_SIZE) #define HEAP_LP_SYSTEM_SIZE 0x1000

#define HEAP_LP_RUNTIME_BASE (HEAP_LP_SYSTEM_BASE + HEAP_LP_SYSTEM_SIZE) @@ -320,7 +320,7 @@

#define HEAP_LP_BUFFER_BASE (HEAP_LP_RUNTIME_BASE + HEAP_LP_RUNTIME_SIZE) #define HEAP_LP_BUFFER_SIZE \ - (LP_SRAM_SIZE - HEAP_LP_RUNTIME_SIZE - REEF_LP_STACK_SIZE - HEAP_LP_SYSTEM_SIZE) + (LP_SRAM_SIZE - HEAP_LP_RUNTIME_SIZE - SOF_LP_STACK_SIZE - HEAP_LP_SYSTEM_SIZE)

#define HEAP_LP_BUFFER_BLOCK_SIZE 0x180 #define HEAP_LP_BUFFER_COUNT (HEAP_LP_BUFFER_SIZE / HEAP_LP_BUFFER_BLOCK_SIZE) @@ -330,24 +330,24 @@ #define PLATFORM_HEAP_BUFFER 3

/* Stack configuration */ -#define REEF_LP_STACK_SIZE 0x1000 -#define REEF_LP_STACK_BASE (LP_SRAM_BASE + LP_SRAM_SIZE) -#define REEF_LP_STACK_END (REEF_LP_STACK_BASE - REEF_LP_STACK_SIZE) +#define SOF_LP_STACK_SIZE 0x1000 +#define SOF_LP_STACK_BASE (LP_SRAM_BASE + LP_SRAM_SIZE) +#define SOF_LP_STACK_END (SOF_LP_STACK_BASE - SOF_LP_STACK_SIZE)

/* Vector and literal sizes - not in core-isa.h */ -#define REEF_MEM_VECT_LIT_SIZE 0x8 -#define REEF_MEM_VECT_TEXT_SIZE 0x38 -#define REEF_MEM_VECT_SIZE (REEF_MEM_VECT_TEXT_SIZE + REEF_MEM_VECT_LIT_SIZE) +#define SOF_MEM_VECT_LIT_SIZE 0x8 +#define SOF_MEM_VECT_TEXT_SIZE 0x38 +#define SOF_MEM_VECT_SIZE (SOF_MEM_VECT_TEXT_SIZE + SOF_MEM_VECT_LIT_SIZE)

-#define REEF_MEM_ERROR_TEXT_SIZE 0x180 -#define REEF_MEM_ERROR_LIT_SIZE 0x8 +#define SOF_MEM_ERROR_TEXT_SIZE 0x180 +#define SOF_MEM_ERROR_LIT_SIZE 0x8

-#define REEF_MEM_RESET_TEXT_SIZE 0x268 -#define REEF_MEM_RESET_LIT_SIZE 0x8 -#define REEF_MEM_VECBASE_LIT_SIZE 0x178 +#define SOF_MEM_RESET_TEXT_SIZE 0x268 +#define SOF_MEM_RESET_LIT_SIZE 0x8 +#define SOF_MEM_VECBASE_LIT_SIZE 0x178

-#define REEF_MEM_RO_SIZE 0x8 +#define SOF_MEM_RO_SIZE 0x8

/* boot loader in IMR */ #define IMR_BOOT_LDR_TEXT_ENTRY_BASE 0xB0038000 diff --git a/src/platform/cannonlake/include/platform/platform.h b/src/platform/cannonlake/include/platform/platform.h index 44345bc..c5bf42a 100644 --- a/src/platform/cannonlake/include/platform/platform.h +++ b/src/platform/cannonlake/include/platform/platform.h @@ -37,7 +37,7 @@ #include <platform/interrupt.h> #include <uapi/ipc.h>

-struct reef; +struct sof;

#define PLATFORM_SSP_COUNT 3 #define MAX_GPDMA_COUNT 2 @@ -128,7 +128,7 @@ extern struct timer *platform_timer;

int platform_boot_complete(uint32_t boot_message);

-int platform_init(struct reef *reef); +int platform_init(struct sof *sof);

int platform_ssp_set_mn(uint32_t ssp_port, uint32_t source, uint32_t rate, uint32_t bclk_fs); diff --git a/src/platform/cannonlake/include/platform/timer.h b/src/platform/cannonlake/include/platform/timer.h index a072f45..02b7c6e 100644 --- a/src/platform/cannonlake/include/platform/timer.h +++ b/src/platform/cannonlake/include/platform/timer.h @@ -34,7 +34,7 @@ #define __PLATFORM_TIMER_H__

#include <stdint.h> -#include <reef/timer.h> +#include <sof/timer.h> #include <platform/interrupt.h>

#define TIMER_COUNT 5 diff --git a/src/platform/cannonlake/interrupt.c b/src/platform/cannonlake/interrupt.c index 3268362..8c47e14 100644 --- a/src/platform/cannonlake/interrupt.c +++ b/src/platform/cannonlake/interrupt.c @@ -30,9 +30,9 @@ * Rander Wang rander.wang@intel.com */

-#include <reef/reef.h> -#include <reef/interrupt.h> -#include <reef/interrupt-map.h> +#include <sof/sof.h> +#include <sof/interrupt.h> +#include <sof/interrupt-map.h> #include <arch/interrupt.h> #include <platform/interrupt.h> #include <platform/shim.h> @@ -221,7 +221,7 @@ static struct irq_parent dsp_irq[4] = {

struct irq_parent *platform_irq_get_parent(uint32_t irq) { - switch (REEF_IRQ_NUMBER(irq)) { + switch (SOF_IRQ_NUMBER(irq)) { case IRQ_NUM_EXT_LEVEL2: return &dsp_irq[0]; case IRQ_NUM_EXT_LEVEL3: @@ -243,18 +243,18 @@ uint32_t platform_interrupt_get_enabled(void) void platform_interrupt_mask(uint32_t irq, uint32_t mask) { /* mask external interrupt bit */ - switch (REEF_IRQ_NUMBER(irq)) { + switch (SOF_IRQ_NUMBER(irq)) { case IRQ_NUM_EXT_LEVEL5: - irq_write(REG_IRQ_IL5MSD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL5MSD(0), 1 << SOF_IRQ_BIT(irq)); break; case IRQ_NUM_EXT_LEVEL4: - irq_write(REG_IRQ_IL4MSD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL4MSD(0), 1 << SOF_IRQ_BIT(irq)); break; case IRQ_NUM_EXT_LEVEL3: - irq_write(REG_IRQ_IL3MSD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL3MSD(0), 1 << SOF_IRQ_BIT(irq)); break; case IRQ_NUM_EXT_LEVEL2: - irq_write(REG_IRQ_IL2MSD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL2MSD(0), 1 << SOF_IRQ_BIT(irq)); break; default: break; @@ -265,18 +265,18 @@ void platform_interrupt_mask(uint32_t irq, uint32_t mask) void platform_interrupt_unmask(uint32_t irq, uint32_t mask) { /* unmask external interrupt bit */ - switch (REEF_IRQ_NUMBER(irq)) { + switch (SOF_IRQ_NUMBER(irq)) { case IRQ_NUM_EXT_LEVEL5: - irq_write(REG_IRQ_IL5MCD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL5MCD(0), 1 << SOF_IRQ_BIT(irq)); break; case IRQ_NUM_EXT_LEVEL4: - irq_write(REG_IRQ_IL4MCD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL4MCD(0), 1 << SOF_IRQ_BIT(irq)); break; case IRQ_NUM_EXT_LEVEL3: - irq_write(REG_IRQ_IL3MCD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL3MCD(0), 1 << SOF_IRQ_BIT(irq)); break; case IRQ_NUM_EXT_LEVEL2: - irq_write(REG_IRQ_IL2MCD(0), 1 << REEF_IRQ_BIT(irq)); + irq_write(REG_IRQ_IL2MCD(0), 1 << SOF_IRQ_BIT(irq)); break; default: break; diff --git a/src/platform/cannonlake/memory.c b/src/platform/cannonlake/memory.c index 69c445b..8a2a818 100644 --- a/src/platform/cannonlake/memory.c +++ b/src/platform/cannonlake/memory.c @@ -28,7 +28,7 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#include <reef/alloc.h> +#include <sof/alloc.h>

/* Heap blocks for modules */ static struct block_hdr mod_block16[HEAP_RT_COUNT16]; diff --git a/src/platform/cannonlake/platform.c b/src/platform/cannonlake/platform.c index a0198e5..9c56047 100644 --- a/src/platform/cannonlake/platform.c +++ b/src/platform/cannonlake/platform.c @@ -38,17 +38,17 @@ #include <platform/timer.h> #include <platform/interrupt.h> #include <uapi/ipc.h> -#include <reef/mailbox.h> -#include <reef/dai.h> -#include <reef/dma.h> -#include <reef/reef.h> -#include <reef/work.h> -#include <reef/clock.h> -#include <reef/ipc.h> -#include <reef/agent.h> -#include <reef/io.h> -#include <reef/trace.h> -#include <reef/audio/component.h> +#include <sof/mailbox.h> +#include <sof/dai.h> +#include <sof/dma.h> +#include <sof/sof.h> +#include <sof/work.h> +#include <sof/clock.h> +#include <sof/ipc.h> +#include <sof/agent.h> +#include <sof/io.h> +#include <sof/trace.h> +#include <sof/audio/component.h> #include <config.h> #include <string.h> #include <version.h> @@ -59,12 +59,12 @@ static const struct sof_ipc_fw_ready ready = { .size = sizeof(struct sof_ipc_fw_ready), }, .version = { - .build = REEF_BUILD, - .minor = REEF_MINOR, - .major = REEF_MAJOR, + .build = SOF_BUILD, + .minor = SOF_MINOR, + .major = SOF_MAJOR, .date = __DATE__, .time = __TIME__, - .tag = REEF_TAG, + .tag = SOF_TAG, }, };

@@ -206,7 +206,7 @@ static struct timer platform_ext_timer = { .irq = IRQ_EXT_TSTAMP0_LVL2(0), };

-int platform_init(struct reef *reef) +int platform_init(struct sof *sof) { struct dma *dmac; struct dai *ssp; @@ -233,7 +233,7 @@ int platform_init(struct reef *reef) init_system_workq(&platform_generic_queue);

/* init the system agent */ - sa_init(reef); + sa_init(sof);

/* Set CPU to default frequency for booting */ trace_point(TRACE_BOOT_SYS_CPU_FREQ); @@ -245,7 +245,7 @@ int platform_init(struct reef *reef)

/* initialise the host IPC mechanisms */ trace_point(TRACE_BOOT_PLATFORM_IPC); - ipc_init(reef); + ipc_init(sof);

/* prevent Core0 clock gating. */ shim_write(SHIM_CLKCTL, shim_read(SHIM_CLKCTL) | @@ -290,7 +290,7 @@ int platform_init(struct reef *reef) }

/* Initialize DMA for Trace*/ - dma_trace_init_complete(reef->dmat); + dma_trace_init_complete(sof->dmat);

return 0; } diff --git a/src/platform/cannonlake/timer.c b/src/platform/cannonlake/timer.c index d2ee870..8a1395d 100644 --- a/src/platform/cannonlake/timer.c +++ b/src/platform/cannonlake/timer.c @@ -32,8 +32,8 @@

#include <platform/timer.h> #include <platform/shim.h> -#include <reef/debug.h> -#include <reef/audio/component.h> +#include <sof/debug.h> +#include <sof/audio/component.h> #include <stdint.h>

void platform_timer_start(struct timer *timer) diff --git a/src/platform/haswell/Makefile.am b/src/platform/haswell/Makefile.am index c132f53..59c33b3 100644 --- a/src/platform/haswell/Makefile.am +++ b/src/platform/haswell/Makefile.am @@ -13,5 +13,5 @@ libplatform_a_SOURCES = \ libplatform_a_CFLAGS = \ $(ARCH_CFLAGS) \ $(ARCH_INCDIR) \ - $(REEF_INCDIR) \ + $(SOF_INCDIR) \ $(PLATFORM_INCDIR) diff --git a/src/platform/haswell/broadwell.x.in b/src/platform/haswell/broadwell.x.in index bec408d..9551eb6 100755 --- a/src/platform/haswell/broadwell.x.in +++ b/src/platform/haswell/broadwell.x.in @@ -16,76 +16,76 @@ MEMORY { vector_reset_text : org = XCHAL_RESET_VECTOR0_PADDR, - len = REEF_MEM_RESET_TEXT_SIZE + len = SOF_MEM_RESET_TEXT_SIZE vector_reset_lit : - org = XCHAL_RESET_VECTOR0_PADDR + REEF_MEM_RESET_TEXT_SIZE, - len = REEF_MEM_RESET_LIT_SIZE + org = XCHAL_RESET_VECTOR0_PADDR + SOF_MEM_RESET_TEXT_SIZE, + len = SOF_MEM_RESET_LIT_SIZE vector_base_text : org = XCHAL_VECBASE_RESET_PADDR, - len = REEF_MEM_VECBASE_LIT_SIZE + len = SOF_MEM_VECBASE_LIT_SIZE vector_int2_lit : - org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL2_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int2_text : org = XCHAL_INTLEVEL2_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int3_lit : - org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL3_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int3_text : org = XCHAL_INTLEVEL3_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int4_lit : - org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL4_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int4_text : org = XCHAL_INTLEVEL4_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int5_lit : - org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL5_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int5_text : org = XCHAL_INTLEVEL5_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int6_lit : - org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL6_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int6_text : org = XCHAL_INTLEVEL6_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int7_lit : - org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL7_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int7_text : org = XCHAL_INTLEVEL7_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_kernel_lit : - org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_KERNEL_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_kernel_text : org = XCHAL_KERNEL_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_user_lit : - org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_USER_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_user_text : org = XCHAL_USER_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_double_lit : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_DOUBLEEXC_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_double_text : org = XCHAL_DOUBLEEXC_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - reef_text_start : - org = XCHAL_NMI_VECTOR_VADDR + REEF_MEM_VECT_SIZE, - len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_NMI_VECTOR_VADDR + REEF_MEM_VECT_SIZE) - reef_data_ro : + len = SOF_MEM_VECT_TEXT_SIZE + sof_text_start : + org = XCHAL_NMI_VECTOR_VADDR + SOF_MEM_VECT_SIZE, + len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_NMI_VECTOR_VADDR + SOF_MEM_VECT_SIZE) + sof_data_ro : org = DRAM0_BASE, - len = REEF_MEM_RO_SIZE - reef_data : - org = DRAM0_BASE + REEF_MEM_RO_SIZE, - len = HEAP_SYSTEM_BASE - (DRAM0_BASE + REEF_MEM_RO_SIZE) + len = SOF_MEM_RO_SIZE + sof_data : + org = DRAM0_BASE + SOF_MEM_RO_SIZE, + len = HEAP_SYSTEM_BASE - (DRAM0_BASE + SOF_MEM_RO_SIZE) system_heap : org = HEAP_SYSTEM_BASE, len = HEAP_SYSTEM_SIZE @@ -95,9 +95,9 @@ MEMORY buffer_heap : org = HEAP_BUFFER_BASE, len = HEAP_BUFFER_SIZE - reef_stack : - org = REEF_STACK_END, - len = REEF_STACK_BASE - REEF_STACK_END + sof_stack : + org = SOF_STACK_END, + len = SOF_STACK_BASE - SOF_STACK_END }

PHDRS @@ -124,14 +124,14 @@ PHDRS vector_user_lit_phdr PT_LOAD; vector_double_text_phdr PT_LOAD; vector_double_lit_phdr PT_LOAD; - reef_text_start_phdr PT_LOAD; - reef_data_ro_phdr PT_LOAD; - reef_data_phdr PT_LOAD; - reef_data_bss_phdr PT_LOAD; + sof_text_start_phdr PT_LOAD; + sof_data_ro_phdr PT_LOAD; + sof_data_phdr PT_LOAD; + sof_data_bss_phdr PT_LOAD; system_heap_phdr PT_LOAD; runtime_heap_phdr PT_LOAD; buffer_heap_phdr PT_LOAD; - reef_stack_phdr PT_LOAD; + sof_stack_phdr PT_LOAD; }

/* Default entry point: */ @@ -321,14 +321,14 @@ SECTIONS *(.gnu.version) _text_end = ABSOLUTE(.); _etext = .; - } >reef_text_start :reef_text_start_phdr + } >sof_text_start :sof_text_start_phdr

.reset.rodata : ALIGN(4) { _reset_rodata_start = ABSOLUTE(.); *(.reset.rodata) _reset_rodata_end = ABSOLUTE(.); - } >reef_data_ro :reef_data_ro_phdr + } >sof_data_ro :sof_data_ro_phdr

.rodata : ALIGN(4) { @@ -366,7 +366,7 @@ SECTIONS LONG(_bss_end) _bss_table_end = ABSOLUTE(.); _rodata_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.data : ALIGN(4) { @@ -384,7 +384,7 @@ SECTIONS *(.gnu.linkonce.s2.*) KEEP(*(.jcr)) _data_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.lit4 : ALIGN(4) { @@ -393,7 +393,7 @@ SECTIONS *(.lit4.*) *(.gnu.linkonce.lit4.*) _lit4_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.bss (NOLOAD) : ALIGN(8) { @@ -414,13 +414,13 @@ SECTIONS *(COMMON) . = ALIGN (8); _bss_end = ABSOLUTE(.); - } >reef_data :reef_data_bss_phdr + } >sof_data :sof_data_bss_phdr

/* stack */ - _end = REEF_STACK_END; - PROVIDE(end = REEF_STACK_END); - _stack_sentry = REEF_STACK_END; - __stack = REEF_STACK_BASE; + _end = SOF_STACK_END; + PROVIDE(end = SOF_STACK_END); + _stack_sentry = SOF_STACK_END; + __stack = SOF_STACK_BASE;

.debug 0 : { *(.debug) } .line 0 : { *(.line) } @@ -497,12 +497,12 @@ SECTIONS _system_heap_end = ABSOLUTE(.); } >buffer_heap :buffer_heap_phdr

- .reef_stack (NOLOAD) : ALIGN(8) + .sof_stack (NOLOAD) : ALIGN(8) { . = ALIGN (4096); - _reef_stack_start = ABSOLUTE(.); - . = . + REEF_STACK_SIZE; - _reef_stack_end = ABSOLUTE(.); - } >reef_stack :reef_stack_phdr + _sof_stack_start = ABSOLUTE(.); + . = . + SOF_STACK_SIZE; + _sof_stack_end = ABSOLUTE(.); + } >sof_stack :sof_stack_phdr }

diff --git a/src/platform/haswell/clk.c b/src/platform/haswell/clk.c index 8a724a8..d784347 100644 --- a/src/platform/haswell/clk.c +++ b/src/platform/haswell/clk.c @@ -28,13 +28,13 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#include <reef/clock.h> -#include <reef/io.h> -#include <reef/reef.h> -#include <reef/list.h> -#include <reef/alloc.h> -#include <reef/notifier.h> -#include <reef/lock.h> +#include <sof/clock.h> +#include <sof/io.h> +#include <sof/sof.h> +#include <sof/list.h> +#include <sof/alloc.h> +#include <sof/notifier.h> +#include <sof/lock.h> #include <platform/clk.h> #include <platform/shim.h> #include <platform/timer.h> diff --git a/src/platform/haswell/dai.c b/src/platform/haswell/dai.c index 4a05e6a..91c05ff 100644 --- a/src/platform/haswell/dai.c +++ b/src/platform/haswell/dai.c @@ -28,11 +28,11 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#include <reef/reef.h> -#include <reef/dai.h> -#include <reef/ssp.h> -#include <reef/stream.h> -#include <reef/audio/component.h> +#include <sof/sof.h> +#include <sof/dai.h> +#include <sof/ssp.h> +#include <sof/stream.h> +#include <sof/audio/component.h> #include <platform/memory.h> #include <platform/interrupt.h> #include <platform/dma.h> diff --git a/src/platform/haswell/dma.c b/src/platform/haswell/dma.c index 92cd5db..42df546 100644 --- a/src/platform/haswell/dma.c +++ b/src/platform/haswell/dma.c @@ -28,8 +28,8 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#include <reef/dma.h> -#include <reef/dw-dma.h> +#include <sof/dma.h> +#include <sof/dw-dma.h> #include <platform/memory.h> #include <platform/interrupt.h> #include <platform/dma.h> diff --git a/src/platform/haswell/haswell.x.in b/src/platform/haswell/haswell.x.in index 27b242f..8733bfc 100755 --- a/src/platform/haswell/haswell.x.in +++ b/src/platform/haswell/haswell.x.in @@ -16,76 +16,76 @@ MEMORY { vector_reset_text : org = XCHAL_RESET_VECTOR0_PADDR, - len = REEF_MEM_RESET_TEXT_SIZE + len = SOF_MEM_RESET_TEXT_SIZE vector_reset_lit : - org = XCHAL_RESET_VECTOR0_PADDR + REEF_MEM_RESET_TEXT_SIZE, - len = REEF_MEM_RESET_LIT_SIZE + org = XCHAL_RESET_VECTOR0_PADDR + SOF_MEM_RESET_TEXT_SIZE, + len = SOF_MEM_RESET_LIT_SIZE vector_base_text : org = XCHAL_VECBASE_RESET_PADDR, - len = REEF_MEM_VECBASE_LIT_SIZE + len = SOF_MEM_VECBASE_LIT_SIZE vector_int2_lit : - org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL2_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int2_text : org = XCHAL_INTLEVEL2_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int3_lit : - org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL3_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int3_text : org = XCHAL_INTLEVEL3_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int4_lit : - org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL4_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int4_text : org = XCHAL_INTLEVEL4_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int5_lit : - org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL5_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int5_text : org = XCHAL_INTLEVEL5_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int6_lit : - org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL6_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int6_text : org = XCHAL_INTLEVEL6_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_int7_lit : - org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_INTLEVEL7_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_int7_text : org = XCHAL_INTLEVEL7_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_kernel_lit : - org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_KERNEL_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_kernel_text : org = XCHAL_KERNEL_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_user_lit : - org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_USER_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_user_text : org = XCHAL_USER_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE + len = SOF_MEM_VECT_TEXT_SIZE vector_double_lit : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE + org = XCHAL_DOUBLEEXC_VECTOR_PADDR - SOF_MEM_VECT_LIT_SIZE, + len = SOF_MEM_VECT_LIT_SIZE vector_double_text : org = XCHAL_DOUBLEEXC_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - reef_text_start : - org = XCHAL_NMI_VECTOR_VADDR + REEF_MEM_VECT_SIZE, - len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_NMI_VECTOR_VADDR + REEF_MEM_VECT_SIZE) - reef_data_ro : + len = SOF_MEM_VECT_TEXT_SIZE + sof_text_start : + org = XCHAL_NMI_VECTOR_VADDR + SOF_MEM_VECT_SIZE, + len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_NMI_VECTOR_VADDR + SOF_MEM_VECT_SIZE) + sof_data_ro : org = DRAM0_BASE, - len = REEF_MEM_RO_SIZE - reef_data : - org = DRAM0_BASE + REEF_MEM_RO_SIZE, - len = HEAP_SYSTEM_BASE - (DRAM0_BASE + REEF_MEM_RO_SIZE) + len = SOF_MEM_RO_SIZE + sof_data : + org = DRAM0_BASE + SOF_MEM_RO_SIZE, + len = HEAP_SYSTEM_BASE - (DRAM0_BASE + SOF_MEM_RO_SIZE) system_heap : org = HEAP_SYSTEM_BASE, len = HEAP_SYSTEM_SIZE @@ -95,9 +95,9 @@ MEMORY buffer_heap : org = HEAP_BUFFER_BASE, len = HEAP_BUFFER_SIZE - reef_stack : - org = REEF_STACK_END, - len = REEF_STACK_BASE - REEF_STACK_END + sof_stack : + org = SOF_STACK_END, + len = SOF_STACK_BASE - SOF_STACK_END }

PHDRS @@ -124,14 +124,14 @@ PHDRS vector_user_lit_phdr PT_LOAD; vector_double_text_phdr PT_LOAD; vector_double_lit_phdr PT_LOAD; - reef_text_start_phdr PT_LOAD; - reef_data_ro_phdr PT_LOAD; - reef_data_phdr PT_LOAD; - reef_data_bss_phdr PT_LOAD; + sof_text_start_phdr PT_LOAD; + sof_data_ro_phdr PT_LOAD; + sof_data_phdr PT_LOAD; + sof_data_bss_phdr PT_LOAD; system_heap_phdr PT_LOAD; runtime_heap_phdr PT_LOAD; buffer_heap_phdr PT_LOAD; - reef_stack_phdr PT_LOAD; + sof_stack_phdr PT_LOAD; }

/* Default entry point: */ @@ -321,14 +321,14 @@ SECTIONS *(.gnu.version) _text_end = ABSOLUTE(.); _etext = .; - } >reef_text_start :reef_text_start_phdr + } >sof_text_start :sof_text_start_phdr

.reset.rodata : ALIGN(4) { _reset_rodata_start = ABSOLUTE(.); *(.reset.rodata) _reset_rodata_end = ABSOLUTE(.); - } >reef_data_ro :reef_data_ro_phdr + } >sof_data_ro :sof_data_ro_phdr

.rodata : ALIGN(4) { @@ -366,7 +366,7 @@ SECTIONS LONG(_bss_end) _bss_table_end = ABSOLUTE(.); _rodata_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.data : ALIGN(4) { @@ -384,7 +384,7 @@ SECTIONS *(.gnu.linkonce.s2.*) KEEP(*(.jcr)) _data_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.lit4 : ALIGN(4) { @@ -393,7 +393,7 @@ SECTIONS *(.lit4.*) *(.gnu.linkonce.lit4.*) _lit4_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr + } >sof_data :sof_data_phdr

.bss (NOLOAD) : ALIGN(8) { @@ -414,13 +414,13 @@ SECTIONS *(COMMON) . = ALIGN (8); _bss_end = ABSOLUTE(.); - } >reef_data :reef_data_bss_phdr + } >sof_data :sof_data_bss_phdr

/* stack */ - _end = REEF_STACK_END; - PROVIDE(end = REEF_STACK_END); - _stack_sentry = REEF_STACK_END; - __stack = REEF_STACK_BASE; + _end = SOF_STACK_END; + PROVIDE(end = SOF_STACK_END); + _stack_sentry = SOF_STACK_END; + __stack = SOF_STACK_BASE;

.debug 0 : { *(.debug) } .line 0 : { *(.line) } @@ -497,12 +497,12 @@ SECTIONS _system_heap_end = ABSOLUTE(.); } >buffer_heap :buffer_heap_phdr

- .reef_stack (NOLOAD) : ALIGN(8) + .sof_stack (NOLOAD) : ALIGN(8) { . = ALIGN (4096); - _reef_stack_start = ABSOLUTE(.); - . = . + REEF_STACK_SIZE; - _reef_stack_end = ABSOLUTE(.); - } >reef_stack :reef_stack_phdr + _sof_stack_start = ABSOLUTE(.); + . = . + SOF_STACK_SIZE; + _sof_stack_end = ABSOLUTE(.); + } >sof_stack :sof_stack_phdr }

diff --git a/src/platform/haswell/include/platform/interrupt.h b/src/platform/haswell/include/platform/interrupt.h index f206491..603da5f 100644 --- a/src/platform/haswell/include/platform/interrupt.h +++ b/src/platform/haswell/include/platform/interrupt.h @@ -33,7 +33,7 @@

#include <stdint.h> #include <stddef.h> -#include <reef/interrupt-map.h> +#include <sof/interrupt-map.h>

#define PLATFORM_IRQ_CHILDREN 0

diff --git a/src/platform/haswell/include/platform/memory.h b/src/platform/haswell/include/platform/memory.h index f04ef97..a79d0f6 100644 --- a/src/platform/haswell/include/platform/memory.h +++ b/src/platform/haswell/include/platform/memory.h @@ -74,7 +74,7 @@ * +--------------------------------------------------------------------------+ * | Offset | Region | Size | * +---------------------+----------------+-----------------------------------+ - * | DRAM0_BASE | RO Data | REEF_DATA_SIZE | + * | DRAM0_BASE | RO Data | SOF_DATA_SIZE | * | | Data | | * | | BSS | | * +---------------------+----------------+-----------------------------------+ @@ -86,9 +86,9 @@ * +---------------------+----------------+-----------------------------------+ * | MAILBOX_BASE | Mailbox | MAILBOX_SIZE | * +---------------------+----------------+-----------------------------------+ - * | REEF_STACK_END | Stack | REEF_STACK_SIZE | + * | SOF_STACK_END | Stack | SOF_STACK_SIZE | * +---------------------+----------------+-----------------------------------+ - * | REEF_STACK_BASE | | | + * | SOF_STACK_BASE | | | * +---------------------+----------------+-----------------------------------+ */

@@ -104,9 +104,9 @@ #define HEAP_RT_COUNT1024 4

/* Heap configuration */ -#define REEF_DATA_SIZE 0xa000 +#define SOF_DATA_SIZE 0xa000

-#define HEAP_SYSTEM_BASE (DRAM0_BASE + REEF_DATA_SIZE) +#define HEAP_SYSTEM_BASE (DRAM0_BASE + SOF_DATA_SIZE) #define HEAP_SYSTEM_SIZE 0x2000

#define HEAP_RUNTIME_BASE (HEAP_SYSTEM_BASE + HEAP_SYSTEM_SIZE) @@ -118,8 +118,8 @@

#define HEAP_BUFFER_BASE (HEAP_RUNTIME_BASE + HEAP_RUNTIME_SIZE) #define HEAP_BUFFER_SIZE \ - (DRAM0_SIZE - HEAP_RUNTIME_SIZE - REEF_STACK_SIZE -\ - HEAP_SYSTEM_SIZE - REEF_DATA_SIZE - MAILBOX_SIZE) + (DRAM0_SIZE - HEAP_RUNTIME_SIZE - SOF_STACK_SIZE -\ + HEAP_SYSTEM_SIZE - SOF_DATA_SIZE - MAILBOX_SIZE)

#define HEAP_BUFFER_BLOCK_SIZE 0x180 #define HEAP_BUFFER_COUNT (HEAP_BUFFER_SIZE / HEAP_BUFFER_BLOCK_SIZE) @@ -128,21 +128,21 @@ #define PLATFORM_HEAP_BUFFER 1

/* Stack configuration */ -#define REEF_STACK_SIZE 0x1000 -#define REEF_STACK_BASE (DRAM0_BASE + DRAM0_SIZE) -#define REEF_STACK_END (REEF_STACK_BASE - REEF_STACK_SIZE) +#define SOF_STACK_SIZE 0x1000 +#define SOF_STACK_BASE (DRAM0_BASE + DRAM0_SIZE) +#define SOF_STACK_END (SOF_STACK_BASE - SOF_STACK_SIZE)

-#define MAILBOX_BASE (REEF_STACK_END - MAILBOX_SIZE) +#define MAILBOX_BASE (SOF_STACK_END - MAILBOX_SIZE)

/* Vector and literal sizes - not in core-isa.h */ -#define REEF_MEM_VECT_LIT_SIZE 0x4 -#define REEF_MEM_VECT_TEXT_SIZE 0x1c -#define REEF_MEM_VECT_SIZE (REEF_MEM_VECT_TEXT_SIZE + REEF_MEM_VECT_LIT_SIZE) +#define SOF_MEM_VECT_LIT_SIZE 0x4 +#define SOF_MEM_VECT_TEXT_SIZE 0x1c +#define SOF_MEM_VECT_SIZE (SOF_MEM_VECT_TEXT_SIZE + SOF_MEM_VECT_LIT_SIZE)

-#define REEF_MEM_RESET_TEXT_SIZE 0x2e0 -#define REEF_MEM_RESET_LIT_SIZE 0x120 -#define REEF_MEM_VECBASE_LIT_SIZE 0x178 +#define SOF_MEM_RESET_TEXT_SIZE 0x2e0 +#define SOF_MEM_RESET_LIT_SIZE 0x120 +#define SOF_MEM_VECBASE_LIT_SIZE 0x178

-#define REEF_MEM_RO_SIZE 0x8 +#define SOF_MEM_RO_SIZE 0x8

#endif diff --git a/src/platform/haswell/include/platform/platform.h b/src/platform/haswell/include/platform/platform.h index 9ffab90..abe4c84 100644 --- a/src/platform/haswell/include/platform/platform.h +++ b/src/platform/haswell/include/platform/platform.h @@ -35,7 +35,7 @@ #include <platform/interrupt.h> #include <uapi/ipc.h>

-struct reef; +struct sof;

/* IPC Interrupt */ #define PLATFORM_IPC_INTERUPT IRQ_NUM_EXT_IA @@ -112,6 +112,6 @@ struct reef;

int platform_boot_complete(uint32_t boot_message);

-int platform_init(struct reef *reef); +int platform_init(struct sof *sof);

#endif diff --git a/src/platform/haswell/include/platform/timer.h b/src/platform/haswell/include/platform/timer.h index 690d6c6..c51e0e6 100644 --- a/src/platform/haswell/include/platform/timer.h +++ b/src/platform/haswell/include/platform/timer.h @@ -33,7 +33,7 @@ #define __PLATFORM_TIMER_H__

#include <stdint.h> -#include <reef/timer.h> +#include <sof/timer.h> #include <platform/interrupt.h>

#define TIMER_COUNT 3 diff --git a/src/platform/haswell/memory.c b/src/platform/haswell/memory.c index 12e7399..e1eb7cf 100644 --- a/src/platform/haswell/memory.c +++ b/src/platform/haswell/memory.c @@ -28,7 +28,7 @@ * Author: Liam Girdwood liam.r.girdwood@linux.intel.com */

-#include <reef/alloc.h> +#include <sof/alloc.h>

/* Heap blocks for modules */ static struct block_hdr mod_block16[HEAP_RT_COUNT16]; diff --git a/src/platform/haswell/platform.c b/src/platform/haswell/platform.c index 30e8e5d..8d8dbc7 100644 --- a/src/platform/haswell/platform.c +++ b/src/platform/haswell/platform.c @@ -35,19 +35,19 @@ #include <platform/clk.h> #include <platform/timer.h> #include <uapi/ipc.h> -#include <reef/mailbox.h> -#include <reef/dai.h> -#include <reef/dma.h> -#include <reef/interrupt.h> -#include <reef/reef.h> -#include <reef/work.h> -#include <reef/clock.h> -#include <reef/ipc.h> -#include <reef/trace.h> -#include <reef/agent.h> -#include <reef/io.h> -#include <reef/dma-trace.h> -#include <reef/audio/component.h> +#include <sof/mailbox.h> +#include <sof/dai.h> +#include <sof/dma.h> +#include <sof/interrupt.h> +#include <sof/sof.h> +#include <sof/work.h> +#include <sof/clock.h> +#include <sof/ipc.h> +#include <sof/trace.h> +#include <sof/agent.h> +#include <sof/io.h> +#include <sof/dma-trace.h> +#include <sof/audio/component.h> #include <config.h> #include <string.h> #include <version.h> @@ -59,12 +59,12 @@ static const struct sof_ipc_fw_ready ready = { }, /* dspbox is for DSP initiated IPC, hostbox is for host initiated IPC */ .version = { - .build = REEF_BUILD, - .minor = REEF_MINOR, - .major = REEF_MAJOR, + .build = SOF_BUILD, + .minor = SOF_MINOR, + .major = SOF_MAJOR, .date = __DATE__, .time = __TIME__, - .tag = REEF_TAG, + .tag = SOF_TAG, }, /* TODO: add capabilities */ }; @@ -221,7 +221,7 @@ void platform_interrupt_unmask(uint32_t irq, uint32_t mask) } }

-int platform_init(struct reef *reef) +int platform_init(struct sof *sof) { struct dma *dmac0; struct dma *dmac1; @@ -246,7 +246,7 @@ int platform_init(struct reef *reef) platform_timer_start(platform_timer);

/* init the system agent */ - sa_init(reef); + sa_init(sof);

/* Set CPU to default frequency for booting */ trace_point(TRACE_BOOT_SYS_CPU_FREQ); @@ -258,7 +258,7 @@ int platform_init(struct reef *reef)

/* initialise the host IPC mechanisms */ trace_point(TRACE_BOOT_PLATFORM_IPC); - ipc_init(reef); + ipc_init(sof);

/* init DMACs */ trace_point(TRACE_BOOT_PLATFORM_DMA); @@ -293,7 +293,7 @@ int platform_init(struct reef *reef) dai_probe(ssp1);

/* Initialize DMA for Trace*/ - dma_trace_init_complete(reef->dmat); + dma_trace_init_complete(sof->dmat);

return 0; } diff --git a/src/platform/haswell/timer.c b/src/platform/haswell/timer.c index 464b332..ebdbd07 100644 --- a/src/platform/haswell/timer.c +++ b/src/platform/haswell/timer.c @@ -31,8 +31,8 @@ #include <platform/timer.h> #include <platform/shim.h> #include <platform/interrupt.h> -#include <reef/debug.h> -#include <reef/audio/component.h> +#include <sof/debug.h> +#include <sof/audio/component.h> #include <stdint.h>

void platform_timer_start(struct timer *timer) diff --git a/src/tasks/Makefile.am b/src/tasks/Makefile.am index d10a146..190b54d 100644 --- a/src/tasks/Makefile.am +++ b/src/tasks/Makefile.am @@ -6,5 +6,5 @@ libtasks_a_SOURCES = \ libtasks_a_CFLAGS = \ $(ARCH_CFLAGS) \ $(ARCH_INCDIR) \ - $(REEF_INCDIR) \ + $(SOF_INCDIR) \ $(PLATFORM_INCDIR) diff --git a/src/tasks/audio.c b/src/tasks/audio.c index 55913f5..5beae08 100644 --- a/src/tasks/audio.c +++ b/src/tasks/audio.c @@ -30,19 +30,19 @@ * Generic audio task. */

-#include <reef/task.h> -#include <reef/wait.h> -#include <reef/debug.h> -#include <reef/timer.h> -#include <reef/interrupt.h> -#include <reef/ipc.h> -#include <reef/agent.h> +#include <sof/task.h> +#include <sof/wait.h> +#include <sof/debug.h> +#include <sof/timer.h> +#include <sof/interrupt.h> +#include <sof/ipc.h> +#include <sof/agent.h> #include <platform/interrupt.h> #include <platform/shim.h> -#include <reef/audio/pipeline.h> -#include <reef/work.h> -#include <reef/debug.h> -#include <reef/trace.h> +#include <sof/audio/pipeline.h> +#include <sof/work.h> +#include <sof/debug.h> +#include <sof/trace.h> #include <stdint.h> #include <stdlib.h> #include <errno.h> @@ -51,7 +51,7 @@ struct audio_data { struct pipeline *p; };

-int do_task(struct reef *reef) +int do_task(struct sof *sof) { #ifdef STATIC_PIPE struct audio_data pdata; @@ -82,7 +82,7 @@ int do_task(struct reef *reef) while (1) {

/* sleep until next IPC or DMA */ - sa_enter_idle(reef); + sa_enter_idle(sof); wait_for_interrupt(0);

/* now process any IPC messages from host */ diff --git a/version.sh b/version.sh index 5413fb3..815c0b8 100755 --- a/version.sh +++ b/version.sh @@ -28,9 +28,9 @@ if [ -e $DIR/.git -o -d $DIR/.git ]; then echo $VER > $DIR/.tarball-version

# git commit for IPC - echo "#define REEF_TAG "`git log --pretty=format:"%h" -1 | cut -c1-5`"" > $DIR/src/include/version.h + echo "#define SOF_TAG "`git log --pretty=format:"%h" -1 | cut -c1-5`"" > $DIR/src/include/version.h else - echo "#define REEF_TAG "0"" > $DIR/src/include/version.h + echo "#define SOF_TAG "0"" > $DIR/src/include/version.h fi

# build counter @@ -42,7 +42,7 @@ fi

# save and insert build counter echo $num > $DIR/.build -echo "#define REEF_BUILD $num" >> $DIR/src/include/version.h +echo "#define SOF_BUILD $num" >> $DIR/src/include/version.h

#echo version for AC_INIT if [ -e $DIR/.version ]; then