Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: thesofproject/sof
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a603a93fc45d0290b1d5a402be833f39a33fbee6
Choose a base ref
..
head repository: thesofproject/sof
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c48807036f230bdd896048db543ad95d0f753731
Choose a head ref
Showing with 1,393 additions and 1,070 deletions.
  1. +0 −1 app/boards/intel_adsp_ace15_mtpm.conf
  2. +0 −1 app/boards/intel_adsp_ace20_lnl.conf
  3. +0 −1 app/boards/intel_adsp_cavs25.conf
  4. +0 −1 app/boards/intel_adsp_cavs25_tgph.conf
  5. +0 −18 app/boards/nxp_adsp_imx8.overlay
  6. +0 −18 app/boards/nxp_adsp_imx8x.overlay
  7. +5 −19 lmdk/cmake/build.cmake
  8. +1 −1 lmdk/cmake/config.cmake
  9. +0 −13 lmdk/cmake/ldscripts/bss_linker_script.txt
  10. +3 −4 lmdk/cmake/ldscripts/data_linker_script.txt
  11. +1 −1 lmdk/cmake/ldscripts/text_linker_script.txt
  12. +2 −2 lmdk/cmake/xtensa-toolchain.cmake
  13. +0 −9 scripts/cmake/misc.cmake
  14. +2 −2 scripts/rebuild-testbench.sh
  15. +0 −6 scripts/set_xtensa_params.sh
  16. +0 −6 src/audio/Kconfig
  17. +161 −154 src/audio/asrc/asrc.c
  18. +4 −20 src/audio/base_fw.c
  19. +1 −3 src/audio/copier/copier.c
  20. +3 −19 src/audio/google/google_rtc_audio_processing.c
  21. +1 −1 src/audio/host-legacy.c
  22. +4 −4 src/audio/module_adapter/module_adapter.c
  23. +0 −8 src/audio/module_adapter/module_adapter_ipc3.c
  24. +0 −8 src/audio/source_api_helper.c
  25. +17 −11 src/drivers/amd/common/acp_dma.c
  26. +3 −17 src/drivers/amd/rembrandt/acp_bt_dma.c
  27. +20 −44 src/drivers/amd/rembrandt/acp_dma.c
  28. +3 −16 src/drivers/amd/rembrandt/acp_hs_dma.c
  29. +3 −16 src/drivers/amd/rembrandt/acp_sp_dma.c
  30. +3 −17 src/drivers/amd/renoir/acp_bt_dma.c
  31. +15 −35 src/drivers/amd/renoir/acp_dma.c
  32. +3 −14 src/drivers/amd/renoir/acp_sp_dma.c
  33. +3 −17 src/drivers/amd/vangogh/acp_bt_dma.c
  34. +22 −48 src/drivers/amd/vangogh/acp_dma.c
  35. +3 −16 src/drivers/amd/vangogh/acp_hs_dma.c
  36. +3 −16 src/drivers/amd/vangogh/acp_sp_dma.c
  37. +1 −23 src/idc/idc.c
  38. +0 −6 src/include/ipc4/base-config.h
  39. +11 −0 src/include/ipc4/base_fw.h
  40. +1 −1 src/include/sof/audio/component.h
  41. +0 −5 src/include/sof/audio/module_adapter/module/module_interface.h
  42. +0 −1 src/include/sof/audio/source_api.h
  43. +1 −5 src/include/sof/ipc/topology.h
  44. +0 −16 src/init/CMakeLists.txt
  45. +1 −26 src/ipc/CMakeLists.txt
  46. +2 −18 src/ipc/ipc3/CMakeLists.txt
  47. +2 −4 src/ipc/ipc3/helper.c
  48. +1 −25 src/ipc/ipc4/CMakeLists.txt
  49. +3 −6 src/ipc/ipc4/handler.c
  50. +5 −53 src/ipc/ipc4/helper.c
  51. +0 −7 src/platform/intel/cavs/platform.c
  52. +0 −24 src/schedule/zephyr_dma_domain.c
  53. +9 −10 src/schedule/zephyr_ll.c
  54. +1 −2 test/cmocka/src/common_mocks.c
  55. +1 −1 tools/rimage/src/manifest.c
  56. +2 −2 tools/test/topology/test-all.m4
  57. +2 −2 tools/test/topology/test-capture.m4
  58. +8 −8 tools/test/topology/test-playback.m4
  59. +2 −2 tools/test/topology/test-tone-playback.m4
  60. +1 −1 tools/testbench/CMakeLists.txt
  61. +1 −1 tools/testbench/common_test.c
  62. +4 −5 tools/testbench/testbench.c
  63. +1 −1 tools/testbench/topology.c
  64. +2 −2 tools/topology/topology1/development/sof-imx8-compr-pcm-cap-wm8960.m4
  65. +2 −2 tools/topology/topology1/development/sof-imx8-compr-pcm-wm8960.m4
  66. +4 −4 tools/topology/topology1/development/sof-imx8-compr-wm8960.m4
  67. +2 −2 tools/topology/topology1/development/sof-imx8-src-cs42888.m4
  68. +4 −4 tools/topology/topology1/development/sof-imx8-src-wm8960.m4
  69. +2 −2 tools/topology/topology1/development/sof-imx8mp-compr-pcm-cap-wm8960.m4
  70. +2 −2 tools/topology/topology1/development/sof-imx8mp-compr-pcm-wm8960.m4
  71. +4 −4 tools/topology/topology1/development/sof-imx8mp-compr-wm8960.m4
  72. +1 −1 tools/topology/topology1/platform/common/acp-hs.m4
  73. +1 −1 tools/topology/topology1/platform/common/acp-sp.m4
  74. +1 −1 tools/topology/topology1/platform/common/esai.m4
  75. +1 −1 tools/topology/topology1/platform/common/sai.m4
  76. +1 −1 tools/topology/topology1/platform/common/ssp.m4
  77. +2 −2 tools/topology/topology1/sof-acp-renoir.m4
  78. +4 −4 tools/topology/topology1/sof-acp-rmb-dmic4ch.m4
  79. +4 −4 tools/topology/topology1/sof-acp-rmb-tdm8ch-dmic2ch-nau8825-max98360.m4
  80. +4 −4 tools/topology/topology1/sof-acp-rmb-tdm8ch-dmic4ch-rt5682-rt1019.m4
  81. +4 −4 tools/topology/topology1/sof-acp-rmb.m4
  82. +4 −4 tools/topology/topology1/sof-acp-vangogh.m4
  83. +3 −3 tools/topology/topology1/sof-acp_6_3.m4
  84. +18 −18 tools/topology/topology1/sof-cavs-nocodec.m4
  85. +2 −2 tools/topology/topology1/sof-eq-iir-dts-codec-smart-amplifier.m4
  86. +3 −3 tools/topology/topology1/sof-imx8-compr-wm8960-mixer.m4
  87. +2 −2 tools/topology/topology1/sof-imx8-cs42888-mixer.m4
  88. +2 −2 tools/topology/topology1/sof-imx8-cs42888.m4
  89. +2 −2 tools/topology/topology1/sof-imx8-nocodec-sai.m4
  90. +2 −2 tools/topology/topology1/sof-imx8-nocodec.m4
  91. +4 −4 tools/topology/topology1/sof-imx8-wm8960-cs42888.m4
  92. +2 −2 tools/topology/topology1/sof-imx8-wm8960-kwd.m4
  93. +6 −6 tools/topology/topology1/sof-imx8-wm8960-mixer.m4
  94. +4 −4 tools/topology/topology1/sof-imx8-wm8960.m4
  95. +1 −1 tools/topology/topology1/sof-imx8mp-btsco-dual-8ch.m4
  96. +2 −2 tools/topology/topology1/sof-imx8mp-wm8960-kwd.m4
  97. +2 −2 tools/topology/topology1/sof-imx8ulp-btsco.m4
  98. +2 −2 tools/topology/topology1/sof-imx93-wm8962.m4
  99. +2 −2 tools/topology/topology1/sof-rn-rt5682-max98360.m4
  100. +2 −2 tools/topology/topology1/sof-rn-rt5682-rt1019.m4
  101. +2 −2 tools/topology/topology1/sof-smart-amplifier.m4
  102. +2 −2 tools/topology/topology1/sof/pipe-low-latency-playback_mux_tdm4ch.m4
  103. +12 −12 tools/topology/topology2/cavs-mixin-mixout-ssp.conf
  104. +842 −0 tools/topology/topology2/cavs-nocodec-multicore.conf
  105. +7 −53 tools/topology/topology2/cavs-nocodec.conf
  106. +0 −4 tools/topology/topology2/cavs-rt5682.conf
  107. +5 −0 tools/topology/topology2/development/cavs-nocodec-rtcaec.conf
  108. +16 −0 tools/topology/topology2/development/tplg-targets.cmake
  109. +7 −7 tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf
  110. +8 −8 tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf
  111. +1 −1 tools/tplg_parser/CMakeLists.txt
  112. +1 −1 west.yml
  113. +32 −23 zephyr/CMakeLists.txt
  114. +0 −4 zephyr/include/rtos/idc.h
  115. +2 −1 zephyr/lib/cpu.c
1 change: 0 additions & 1 deletion app/boards/intel_adsp_ace15_mtpm.conf
Original file line number Diff line number Diff line change
@@ -90,4 +90,3 @@ CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y

CONFIG_PROBE=y
CONFIG_PROBE_DMA_MAX=2
CONFIG_LOG_TIMESTAMP_64BIT=y
1 change: 0 additions & 1 deletion app/boards/intel_adsp_ace20_lnl.conf
Original file line number Diff line number Diff line change
@@ -75,4 +75,3 @@ CONFIG_COMP_KPB=y
CONFIG_COMP_ARIA=y
CONFIG_CLOCK_CONTROL_ADSP=y
CONFIG_CLOCK_CONTROL=y
CONFIG_LOG_TIMESTAMP_64BIT=y
1 change: 0 additions & 1 deletion app/boards/intel_adsp_cavs25.conf
Original file line number Diff line number Diff line change
@@ -75,4 +75,3 @@ CONFIG_DMA_DW_FIFO_PARTITION=y
CONFIG_DMA_INTEL_ADSP_GPDMA_HAS_LLP=y

CONFIG_HEAP_MEM_POOL_SIZE=8192
CONFIG_LOG_TIMESTAMP_64BIT=y
1 change: 0 additions & 1 deletion app/boards/intel_adsp_cavs25_tgph.conf
Original file line number Diff line number Diff line change
@@ -74,4 +74,3 @@ CONFIG_DMA_DW_FIFO_PARTITION=y
CONFIG_DMA_INTEL_ADSP_GPDMA_HAS_LLP=y

CONFIG_HEAP_MEM_POOL_SIZE=8192
CONFIG_LOG_TIMESTAMP_64BIT=y
18 changes: 0 additions & 18 deletions app/boards/nxp_adsp_imx8.overlay

This file was deleted.

18 changes: 0 additions & 18 deletions app/boards/nxp_adsp_imx8x.overlay

This file was deleted.

24 changes: 5 additions & 19 deletions lmdk/cmake/build.cmake
Original file line number Diff line number Diff line change
@@ -13,8 +13,7 @@ foreach(MODULE ${MODULES_LIST})
add_executable(${MODULE})
add_subdirectory(${LMDK_BASE}/modules/${MODULE} ${MODULE}_module)

# uncomment line below to compile module with debug information
#target_compile_options(${MODULE} PUBLIC "-g3")
### set_target_properties(${MODULE} PROPERTIES OUTPUT_NAME ${MODULE}.mod)

target_include_directories(${MODULE} PRIVATE
"${LMDK_BASE}/include"
@@ -36,9 +35,9 @@ foreach(MODULE ${MODULES_LIST})
)

target_link_options(${MODULE} PRIVATE
"-nostartfiles"
"-nostdlib" "-nodefaultlibs"
"-Wl,--no-undefined" "-Wl,--unresolved-symbols=report-all" "-Wl,--error-unresolved-symbols"
"-Wl,--gc-sections"
#"-Wl,--gc-sections" # may remove .bss and that will result in rimage error, do not use for now
"-Wl,-Map,$<TARGET_FILE:${MODULE}>.map" # optional: just for debug
"-T" "${MODULE}_ldscripts/elf32xtensa.x"
)
@@ -56,26 +55,13 @@ cmake_path(APPEND SOF_BASE "../build-rimage" OUTPUT_VARIABLE RIMAGE_SOF_INSTALL_
cmake_path(NORMAL_PATH RIMAGE_SOF_INSTALL_DIR)
cmake_path(ABSOLUTE_PATH SIGNING_KEY BASE_DIRECTORY ${CMAKE_SOURCE_DIR} NORMALIZE)

foreach(MOD_NAME IN LISTS MODULES_LIST)
list(APPEND RIMAGE_MODULES_LIST ${MOD_NAME}.mod)

# Change .module section flags to tell rimage to not include it in a final image
add_custom_target(${MOD_NAME}.mod
COMMENT "Preparing .mod(ule) files for rimage"
DEPENDS ${MOD_NAME}
COMMAND ${CMAKE_OBJCOPY}
--set-section-flags .module=noload,readonly
${MOD_NAME} ${MOD_NAME}.mod
)
endforeach()

find_program(RIMAGE_COMMAND NAMES rimage
PATHS "${RIMAGE_INSTALL_DIR}"
HINTS "${RIMAGE_SOF_INSTALL_DIR}"
REQUIRED)

add_custom_target(${PROJECT_NAME}_target ALL
DEPENDS ${RIMAGE_MODULES_LIST}
COMMAND ${RIMAGE_COMMAND} -k ${SIGNING_KEY} -f 2.0.0 -b 1 -o ${RIMAGE_OUTPUT_FILE} -c ${TOML} -e ${RIMAGE_MODULES_LIST}
DEPENDS ${MODULES_LIST}
COMMAND ${RIMAGE_COMMAND} -k ${SIGNING_KEY} -f 2.0.0 -b 1 -o ${RIMAGE_OUTPUT_FILE} -c ${TOML} -e ${MODULES_LIST}
COMMAND ${CMAKE_COMMAND} -E cat ${RIMAGE_OUTPUT_FILE}.xman ${RIMAGE_OUTPUT_FILE} > ${OUTPUT_FILE}
)
2 changes: 1 addition & 1 deletion lmdk/cmake/config.cmake
Original file line number Diff line number Diff line change
@@ -14,5 +14,5 @@ cmake_path(ABSOLUTE_PATH LMDK_BASE NORMALIZE)
set(SOF_BASE ${LMDK_BASE}/..)
cmake_path(ABSOLUTE_PATH SOF_BASE NORMALIZE)

set(RIMAGE_INCLUDE_DIR ${SOF_BASE}/tools/rimage/src/include)
set(RIMAGE_INCLUDE_DIR ${SOF_BASE}/rimage/src/include)
cmake_path(ABSOLUTE_PATH RIMAGE_INCLUDE_DIR NORMALIZE)
13 changes: 0 additions & 13 deletions lmdk/cmake/ldscripts/bss_linker_script.txt
Original file line number Diff line number Diff line change
@@ -16,18 +16,5 @@ SECTIONS {
_next_end = ABSOLUTE(.);
*(.bss)
*(.bss.*)

/* Heap memory */
. = ALIGN(4);
__stack = .;
_end = .;
KEEP(*(.heap_mem))

/* Use the unused rest of the memory page as a heap */
. = ALIGN(4096);

/* The sbrk function implementation by xtensa incorrectly checks whether the allocated
memory block fits in the heap, so we have to add 1 to the end of the heap marker. */
_heap_sentry = . + 1;
} >HPSRAM_seg : bss_phdr
}
7 changes: 3 additions & 4 deletions lmdk/cmake/ldscripts/data_linker_script.txt
Original file line number Diff line number Diff line change
@@ -11,11 +11,10 @@ SECTIONS {
_data_start = ABSOLUTE(.);
*(.data)
*(.data.*)
*(.*.data)
_data_end = ABSOLUTE(.);
} >HPSRAM_seg : data_phdr

.rodata : {
.rodata : ALIGN(4096) {
_rodata_start = ABSOLUTE(.);
*(.gnu.linkonce.r.*)
*(.rodata)
@@ -25,7 +24,7 @@ SECTIONS {
} >HPSRAM_seg : rodata_phdr

/* Module manifest is here */
.module 0 : {
.module : ALIGN(4096) {
KEEP(*(.module))
}
} >HPSRAM_seg : rodata_phdr
}
2 changes: 1 addition & 1 deletion lmdk/cmake/ldscripts/text_linker_script.txt
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ PHDRS {
SECTIONS {
.text : ALIGN(4096) {
_text_start = ABSOLUTE(.);
KEEP(*(.buildinfo))
*(.buildinfo)
*(.gnu.linkonce.literal.*)
*(.gnu.linkonce.lit4)
*(.literal)
4 changes: 2 additions & 2 deletions lmdk/cmake/xtensa-toolchain.cmake
Original file line number Diff line number Diff line change
@@ -18,11 +18,11 @@ cmake_path(APPEND XTENSA_TOOLCHAIN_PATH "XtensaTools" OUTPUT_VARIABLE TOOLCHAIN_
set(CROSS_COMPILE xt-)

# clang or xcc
find_program(CMAKE_C_COMPILER NAMES ${CROSS_COMPILE}clang
find_program(CMAKE_C_COMPILER NAMES ${CROSS_COMPILE}xcc
PATHS ${TOOLCHAIN_BASE} PATH_SUFFIXES "bin" REQUIRED NO_DEFAULT_PATH
)
# clang++ or xc++
find_program(CMAKE_CXX_COMPILER NAMES ${CROSS_COMPILE}clang++
find_program(CMAKE_CXX_COMPILER NAMES ${CROSS_COMPILE}xc++
PATHS ${TOOLCHAIN_BASE} PATH_SUFFIXES "bin" REQUIRED NO_DEFAULT_PATH
)
find_program(CMAKE_LD NAMES ${CROSS_COMPILE}ld
9 changes: 0 additions & 9 deletions scripts/cmake/misc.cmake
Original file line number Diff line number Diff line change
@@ -40,15 +40,6 @@ function(get_optimization_flag OUT_VAR)
endif()
endfunction()

# Zephyr duplicate in sof/zephyr/CMakeLists.txt; keep in sync
macro(is_zephyr ret)
if(CONFIG_ZEPHYR_SOF_MODULE)
set(${ret} TRUE)
else()
set(${ret} FALSE)
endif()
endmacro()

# Adds sources to target like target_sources, but assumes that
# paths are relative to subdirectory.
# Works like:
4 changes: 2 additions & 2 deletions scripts/rebuild-testbench.sh
Original file line number Diff line number Diff line change
@@ -57,7 +57,6 @@ setup_xtensa_tools_build()
BUILD_TYPE=xt
BUILD_TARGET=
BUILD_DIR_NAME=build_xt_testbench
COMPILER="xt-xcc"

# check needed environment variables
test -n "${XTENSA_TOOLS_ROOT}" || die "XTENSA_TOOLS_ROOT need to be set.\n"
@@ -73,10 +72,11 @@ setup_xtensa_tools_build()
test -n "${XTENSA_CORE}" ||
die "Illegal platform $BUILD_PLATFORM, no XTENSA_CORE found.\n"

compiler="xt-xcc"
install_bin=install/tools/$XTENSA_TOOLS_VERSION/XtensaTools/bin
tools_bin=$XTENSA_TOOLS_ROOT/$install_bin
testbench_sections="-Wl,--sections-placement $BUILD_TESTBENCH_DIR/testbench_xcc_sections.txt"
export CC=$tools_bin/$COMPILER
export CC=$tools_bin/$compiler
export LD=$tools_bin/xt-ld
export OBJDUMP=$tools_bin/xt-objdump
export LDFLAGS="-mlsp=sim $testbench_sections"
6 changes: 0 additions & 6 deletions scripts/set_xtensa_params.sh
Original file line number Diff line number Diff line change
@@ -81,10 +81,4 @@ case "$platform" in
HOST="xtensa-mt8195-elf"
XTENSA_TOOLS_VERSION="RI-2019.1-linux"
;;
mtl)
PLATFORM="mtl"
XTENSA_CORE="ace10_LX7HiFi4_2022_10"
XTENSA_TOOLS_VERSION="RI-2022.10-linux"
COMPILER="xt-clang"
;;
esac
6 changes: 0 additions & 6 deletions src/audio/Kconfig
Original file line number Diff line number Diff line change
@@ -725,10 +725,4 @@ config COMP_MODULE_SHARED_LIBRARY_BUILD
Select if you want to build modules as shared objects that can be used to run
pipelines on the host with the testbench or the ALSA plugin.

config DISABLE_DESCRIPTOR_SPLIT
bool "Disable descriptor split"
default n
help
This option disbale the descriptor split for host p-table.

endmenu
Loading