Skip to content

treewide: remove CONFIG_ZEPHYR_NATIVE_DRIVERS #10091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kv2019i wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

treewide: remove CONFIG_ZEPHYR_NATIVE_DRIVERS #10091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/boards/acp_6_0_adsp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ CONFIG_DYNAMIC_INTERRUPTS=y
CONFIG_SHARED_INTERRUPTS=n
CONFIG_ZEPHYR_LOG=n
CONFIG_DMA=y
CONFIG_ZEPHYR_NATIVE_DRIVERS=n
CONFIG_AMS=n
1 change: 0 additions & 1 deletion app/boards/imx8mp_evk_mimx8ml8_adsp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ CONFIG_DMA_NXP_SDMA=y
CONFIG_DAI_NXP_MICFIL=y
CONFIG_TRACE=n
CONFIG_SHARED_INTERRUPTS=y
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
CONFIG_SAI_HAS_MCLK_CONFIG_OPTION=y
CONFIG_CLOCK_CONTROL_FIXED_RATE_CLOCK=y
2 changes: 1 addition & 1 deletion app/boards/imx8qm_mek_mimx8qm6_adsp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n
CONFIG_DMA=y
CONFIG_DMA_NXP_EDMA_ENABLE_HALFMAJOR_IRQ=y
CONFIG_SHARED_INTERRUPTS=y
CONFIG_ZEPHYR_NATIVE_DRIVERS=y

2 changes: 1 addition & 1 deletion app/boards/imx8qxp_mek_mimx8qx6_adsp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n
CONFIG_DMA=y
CONFIG_DMA_NXP_EDMA_ENABLE_HALFMAJOR_IRQ=y
CONFIG_SHARED_INTERRUPTS=y
CONFIG_ZEPHYR_NATIVE_DRIVERS=y

1 change: 0 additions & 1 deletion app/boards/imx8ulp_evk_mimx8ud7_adsp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ CONFIG_DMA_NXP_EDMA_ENABLE_HALFMAJOR_IRQ=y
# from DAI bespoke configuration or DTS.
CONFIG_SAI_FIFO_WORD_SIZE=2

CONFIG_ZEPHYR_NATIVE_DRIVERS=y
1 change: 0 additions & 1 deletion app/boards/imx93_evk_mimx9352_a55.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ CONFIG_DMA_NXP_EDMA_ENABLE_HALFMAJOR_IRQ=y
# channels.
CONFIG_SHARED_INTERRUPTS=y

CONFIG_ZEPHYR_NATIVE_DRIVERS=y
1 change: 0 additions & 1 deletion app/boards/imx95_evk_mimx9596_m7_ddr.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
CONFIG_DYNAMIC_INTERRUPTS=y
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
CONFIG_IMX95=y

CONFIG_SAI_HAS_MCLK_CONFIG_OPTION=y
Expand Down
1 change: 0 additions & 1 deletion app/boards/intel_adsp_ace15_mtpm.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ CONFIG_PROBE_DMA_MAX=2
CONFIG_SOF_TELEMETRY=y
CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y
CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
CONFIG_ZEPHYR_DP_SCHEDULER=y
CONFIG_ZEPHYR_TWB_SCHEDULER=y
CONFIG_COLD_STORE_EXECUTE_DRAM=y
Expand Down
1 change: 0 additions & 1 deletion app/boards/intel_adsp_ace20_lnl.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ CONFIG_SOF_TELEMETRY=y
CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y
CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y
CONFIG_ZEPHYR_DP_SCHEDULER=y
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
CONFIG_COLD_STORE_EXECUTE_DRAM=y

# SOF / loadable modules
Expand Down
1 change: 0 additions & 1 deletion app/boards/intel_adsp_ace30_ptl.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ CONFIG_SOF_TELEMETRY=y
CONFIG_SOF_TELEMETRY_IO_PERFORMANCE_MEASUREMENTS=y
CONFIG_SOF_TELEMETRY_PERFORMANCE_MEASUREMENTS=y
CONFIG_ZEPHYR_DP_SCHEDULER=y
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
CONFIG_COLD_STORE_EXECUTE_DRAM=y

# SOF / loadable modules
Expand Down
1 change: 0 additions & 1 deletion app/boards/intel_adsp_ace30_ptl_sim.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
CONFIG_PM=n

# enable Zephyr drivers
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
CONFIG_DAI=y
CONFIG_DAI_INIT_PRIORITY=70
CONFIG_DAI_INTEL_DMIC=y
Expand Down
1 change: 0 additions & 1 deletion app/boards/intel_adsp_ace30_wcl.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ CONFIG_KCPS_DYNAMIC_CLOCK_CONTROL=n
CONFIG_PROBE=y
CONFIG_PROBE_DMA_MAX=2
CONFIG_ZEPHYR_DP_SCHEDULER=y
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
CONFIG_COLD_STORE_EXECUTE_DRAM=y

# SOF / loadable modules
Expand Down
1 change: 0 additions & 1 deletion app/boards/intel_adsp_ace30_wcl_sim.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
CONFIG_PM=n

# enable Zephyr drivers
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
CONFIG_DAI=y
CONFIG_DAI_INIT_PRIORITY=70
CONFIG_DAI_INTEL_DMIC=y
Expand Down
1 change: 0 additions & 1 deletion app/boards/intel_adsp_cavs25.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ CONFIG_PCM_CONVERTER_FORMAT_FLOAT=y
CONFIG_AMS=y
CONFIG_LP_MEMORY_BANKS=1
CONFIG_HP_MEMORY_BANKS=30
CONFIG_ZEPHYR_NATIVE_DRIVERS=y

# SOF / loadable modules
CONFIG_INTEL_MODULES=y
Expand Down
1 change: 0 additions & 1 deletion app/boards/intel_adsp_cavs25_tgph.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ CONFIG_PCM_CONVERTER_FORMAT_FLOAT=y
# SOF / infrastructure
CONFIG_LP_MEMORY_BANKS=1
CONFIG_HP_MEMORY_BANKS=30
CONFIG_ZEPHYR_NATIVE_DRIVERS=y

# SOF / loadable modules
CONFIG_INTEL_MODULES=y
Expand Down
1 change: 0 additions & 1 deletion app/boards/native_sim_libfuzzer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ CONFIG_ASSERT=y
CONFIG_EXCEPTION_DEBUG=y
CONFIG_ARCH_POSIX_TRAP_ON_FATAL=y
CONFIG_SYS_HEAP_BIG_ONLY=y
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
CONFIG_ARCH_POSIX_LIBFUZZER=y
CONFIG_ZEPHYR_POSIX_FUZZ_TICKS=100
CONFIG_ZEPHYR_LOG=n
11 changes: 4 additions & 7 deletions src/audio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,10 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
if(CONFIG_INTEL_ADSP_MIC_PRIVACY)
add_subdirectory(mic_privacy_manager)
endif()
if(CONFIG_ZEPHYR_NATIVE_DRIVERS)
list(APPEND base_files host-zephyr.c)
sof_list_append_ifdef(CONFIG_COMP_DAI base_files dai-zephyr.c)
else()
list(APPEND base_files host-legacy.c)
sof_list_append_ifdef(CONFIG_COMP_DAI base_files dai-legacy.c)
endif()

list(APPEND base_files host-zephyr.c)
sof_list_append_ifdef(CONFIG_COMP_DAI base_files dai-zephyr.c)

if(CONFIG_COMP_TEMPLATE_COMP)
add_subdirectory(template_comp)
endif()
Expand Down
4 changes: 0 additions & 4 deletions src/audio/asrc/asrc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,11 +713,7 @@ static int asrc_prepare(struct processing_module *mod,

static int asrc_control_loop(struct comp_dev *dev, struct comp_data *cd)
{
#if CONFIG_ZEPHYR_NATIVE_DRIVERS
struct dai_ts_data tsd;
#else
struct timestamp_data tsd;
#endif
int64_t tmp;
int32_t delta_sample;
int32_t delta_ts;
Expand Down
5 changes: 1 addition & 4 deletions src/audio/asrc/asrc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,8 @@ static inline bool asrc_get_asynchronous_mode(const struct ipc_config_asrc *ipc_

#endif

#if CONFIG_ZEPHYR_NATIVE_DRIVERS
int asrc_dai_get_timestamp(struct comp_data *cd, struct dai_ts_data *tsd);
#else
int asrc_dai_get_timestamp(struct comp_data *cd, struct timestamp_data *tsd);
#endif

/* Simple count value to prevent first delta timestamp
* from being input to low-pass filter.
*/
Expand Down
4 changes: 0 additions & 4 deletions src/audio/asrc/asrc_ipc3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,7 @@ int asrc_dai_stop_timestamp(struct comp_data *cd)
return -EINVAL;
}

#if CONFIG_ZEPHYR_NATIVE_DRIVERS
int asrc_dai_get_timestamp(struct comp_data *cd, struct dai_ts_data *tsd)
#else
int asrc_dai_get_timestamp(struct comp_data *cd, struct timestamp_data *tsd)
#endif
{
if (!cd->dai_dev)
return -EINVAL;
Expand Down
4 changes: 0 additions & 4 deletions src/audio/asrc/asrc_ipc4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,7 @@ int asrc_dai_stop_timestamp(struct comp_data *cd)
return ops->endpoint_ops->dai_ts_stop(cd->dai_dev);
}

#if CONFIG_ZEPHYR_NATIVE_DRIVERS
int asrc_dai_get_timestamp(struct comp_data *cd, struct dai_ts_data *tsd)
#else
int asrc_dai_get_timestamp(struct comp_data *cd, struct timestamp_data *tsd)
#endif
{
if (!cd->dai_dev)
return -ENODEV;
Expand Down
6 changes: 0 additions & 6 deletions src/audio/copier/copier.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@
#include <zephyr/drivers/mic_privacy/intel/mic_privacy.h>
#endif

#if CONFIG_ZEPHYR_NATIVE_DRIVERS
#include <zephyr/drivers/dai.h>
#endif

LOG_MODULE_REGISTER(copier, CONFIG_SOF_LOG_LEVEL);

Expand Down Expand Up @@ -1132,11 +1130,7 @@ static int copier_dai_ts_start_op(struct comp_dev *dev)
return dai_common_ts_start(dd, dev);
}

#if CONFIG_ZEPHYR_NATIVE_DRIVERS
static int copier_dai_ts_get_op(struct comp_dev *dev, struct dai_ts_data *tsd)
#else
static int copier_dai_ts_get_op(struct comp_dev *dev, struct timestamp_data *tsd)
#endif
{
struct processing_module *mod = comp_mod(dev);
struct copier_data *cd = module_get_private_data(mod);
Expand Down
4 changes: 0 additions & 4 deletions src/audio/copier/dai_copier.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@ int dai_common_ts_start(struct dai_data *dd, struct comp_dev *dev);

int dai_common_ts_stop(struct dai_data *dd, struct comp_dev *dev);

#if CONFIG_ZEPHYR_NATIVE_DRIVERS
int dai_common_ts_get(struct dai_data *dd, struct comp_dev *dev, struct dai_ts_data *tsd);
#else
int dai_common_ts_get(struct dai_data *dd, struct comp_dev *dev, struct timestamp_data *tsd);
#endif

int dai_common_get_hw_params(struct dai_data *dd, struct comp_dev *dev,
struct sof_ipc_stream_params *params, int dir);
Expand Down
Loading
Loading