From b73d53edca0878af436f7468fd51625a13b1a4fe Mon Sep 17 00:00:00 2001 From: Andy Ross Date: Tue, 17 Dec 2024 13:29:58 -0800 Subject: [PATCH] zephyr/app: Clean up Zephyr kconfig defaults Things had gotten a little messy here. The CPU_MASK_PIN_ONLY and SMP_BOOT_DELAY options are in fact not generic to all Zephyr builds; they both depend on SMP, and in fact don't exist otherwise, producing a build failure if the board defconfig doesn't turn it off. Create an application "Kconfig" file (which SOF hasn't used so far), which allows the dependencies for these settings to be more cleanly expressed. Similarly CONFIG_TRACE=y won't build with Zephyr, and all boards were turning it off independently. Move that to the prj.conf level. And likewise CONFIG_ZEPHYR_LOG, while not strictly required for a Zephyr build, is pervasively enabled (except on ACP6? What does that device use for logging?), so it belongs in the global file. Signed-off-by: Andy Ross --- app/Kconfig | 8 ++++++++ app/boards/acp_6_0_adsp.conf | 1 - app/boards/imx8qm_mek_mimx8qm6_adsp.conf | 2 -- app/boards/imx8qxp_mek_mimx8qx6_adsp.conf | 2 -- app/boards/imx8ulp_evk_mimx8ud7_adsp.conf | 2 -- app/boards/imx93_evk_mimx9352_a55.conf | 1 - app/boards/imx95_evk_mimx9596_m7_ddr.conf | 1 - app/boards/intel_adsp_ace15_mtpm.conf | 2 -- app/boards/intel_adsp_ace20_lnl.conf | 2 -- app/boards/intel_adsp_ace30_ptl.conf | 2 -- app/boards/intel_adsp_ace30_ptl_sim.conf | 1 - app/boards/intel_adsp_cavs25.conf | 2 -- app/boards/intel_adsp_cavs25_tgph.conf | 2 -- app/boards/native_sim_libfuzzer.conf | 6 ------ app/prj.conf | 8 ++------ 15 files changed, 10 insertions(+), 32 deletions(-) create mode 100644 app/Kconfig diff --git a/app/Kconfig b/app/Kconfig new file mode 100644 index 000000000000..1ea5b4d46f61 --- /dev/null +++ b/app/Kconfig @@ -0,0 +1,8 @@ +config SCHED_CPU_MASK_PIN_ONLY + default y if SMP + +config SMP_BOOT_DELAY + default y if SMP + +source "Kconfig.zephyr" + diff --git a/app/boards/acp_6_0_adsp.conf b/app/boards/acp_6_0_adsp.conf index d56937f651c9..2e4332e31dcd 100644 --- a/app/boards/acp_6_0_adsp.conf +++ b/app/boards/acp_6_0_adsp.conf @@ -5,7 +5,6 @@ CONFIG_DCACHE_LINE_SIZE=128 CONFIG_DYNAMIC_INTERRUPTS=y CONFIG_SHARED_INTERRUPTS=n CONFIG_ZEPHYR_LOG=n -CONFIG_TRACE=n CONFIG_DMA=y CONFIG_ZEPHYR_NATIVE_DRIVERS=n CONFIG_AMS=n diff --git a/app/boards/imx8qm_mek_mimx8qm6_adsp.conf b/app/boards/imx8qm_mek_mimx8qm6_adsp.conf index 6e741fa7a270..6c8eb26b6e9a 100644 --- a/app/boards/imx8qm_mek_mimx8qm6_adsp.conf +++ b/app/boards/imx8qm_mek_mimx8qm6_adsp.conf @@ -2,8 +2,6 @@ CONFIG_IMX8=y CONFIG_HAVE_AGENT=n CONFIG_FORMAT_CONVERT_HIFI3=n CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n -CONFIG_ZEPHYR_LOG=y -CONFIG_TRACE=n CONFIG_DMA=y CONFIG_DMA_NXP_EDMA_ENABLE_HALFMAJOR_IRQ=y CONFIG_SHARED_INTERRUPTS=y diff --git a/app/boards/imx8qxp_mek_mimx8qx6_adsp.conf b/app/boards/imx8qxp_mek_mimx8qx6_adsp.conf index d3e3c3c8be79..e6b3ce395c39 100644 --- a/app/boards/imx8qxp_mek_mimx8qx6_adsp.conf +++ b/app/boards/imx8qxp_mek_mimx8qx6_adsp.conf @@ -2,8 +2,6 @@ CONFIG_IMX8X=y CONFIG_HAVE_AGENT=n CONFIG_FORMAT_CONVERT_HIFI3=n CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n -CONFIG_ZEPHYR_LOG=y -CONFIG_TRACE=n CONFIG_DMA=y CONFIG_DMA_NXP_EDMA_ENABLE_HALFMAJOR_IRQ=y CONFIG_SHARED_INTERRUPTS=y diff --git a/app/boards/imx8ulp_evk_mimx8ud7_adsp.conf b/app/boards/imx8ulp_evk_mimx8ud7_adsp.conf index fdd6e7364c11..5df4c87d3c18 100644 --- a/app/boards/imx8ulp_evk_mimx8ud7_adsp.conf +++ b/app/boards/imx8ulp_evk_mimx8ud7_adsp.conf @@ -3,8 +3,6 @@ CONFIG_HAVE_AGENT=n CONFIG_FORMAT_CONVERT_HIFI3=n CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n -CONFIG_ZEPHYR_LOG=y -CONFIG_TRACE=n CONFIG_DMA=y CONFIG_DMA_NXP_EDMA_ENABLE_HALFMAJOR_IRQ=y diff --git a/app/boards/imx93_evk_mimx9352_a55.conf b/app/boards/imx93_evk_mimx9352_a55.conf index 4f3d12d5a2f8..7c0667da66b9 100644 --- a/app/boards/imx93_evk_mimx9352_a55.conf +++ b/app/boards/imx93_evk_mimx9352_a55.conf @@ -13,7 +13,6 @@ CONFIG_DCACHE_LINE_SIZE_DETECT=n CONFIG_DCACHE_LINE_SIZE=64 CONFIG_IMX93_A55=y -CONFIG_TRACE=n # DAI-related configurations CONFIG_SAI_HAS_MCLK_CONFIG_OPTION=y diff --git a/app/boards/imx95_evk_mimx9596_m7_ddr.conf b/app/boards/imx95_evk_mimx9596_m7_ddr.conf index 21aed31934af..aec33d7c7e91 100644 --- a/app/boards/imx95_evk_mimx9596_m7_ddr.conf +++ b/app/boards/imx95_evk_mimx9596_m7_ddr.conf @@ -1,5 +1,4 @@ CONFIG_DYNAMIC_INTERRUPTS=y -CONFIG_TRACE=n CONFIG_ZEPHYR_NATIVE_DRIVERS=y CONFIG_IMX95=y diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf index 3908ca5d30d3..5341d14e4ddd 100644 --- a/app/boards/intel_adsp_ace15_mtpm.conf +++ b/app/boards/intel_adsp_ace15_mtpm.conf @@ -55,8 +55,6 @@ CONFIG_LIBRARY_BASE_ADDRESS=0xa0688000 # SOF / logging CONFIG_SOF_LOG_LEVEL_INF=y -CONFIG_TRACE=n -CONFIG_ZEPHYR_LOG=y # Zephyr / OS features CONFIG_DEBUG_COREDUMP=y diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf index 7130665f78d0..022a3a9a40b6 100644 --- a/app/boards/intel_adsp_ace20_lnl.conf +++ b/app/boards/intel_adsp_ace20_lnl.conf @@ -43,8 +43,6 @@ CONFIG_LIBRARY_MANAGER=y # SOF / logging CONFIG_SOF_LOG_LEVEL_INF=y -CONFIG_TRACE=n -CONFIG_ZEPHYR_LOG=y # Zephyr / OS features CONFIG_COUNTER=y diff --git a/app/boards/intel_adsp_ace30_ptl.conf b/app/boards/intel_adsp_ace30_ptl.conf index 0be2f1802a54..d7c1979b63a4 100644 --- a/app/boards/intel_adsp_ace30_ptl.conf +++ b/app/boards/intel_adsp_ace30_ptl.conf @@ -38,9 +38,7 @@ CONFIG_INTEL_MODULES=y CONFIG_LIBRARY_MANAGER=y # SOF / logging -CONFIG_TRACE=n CONFIG_SOF_LOG_LEVEL_INF=y -CONFIG_ZEPHYR_LOG=y # Zephyr / OS features CONFIG_COUNTER=y diff --git a/app/boards/intel_adsp_ace30_ptl_sim.conf b/app/boards/intel_adsp_ace30_ptl_sim.conf index be8d2b52c59e..eb72fb6598cc 100644 --- a/app/boards/intel_adsp_ace30_ptl_sim.conf +++ b/app/boards/intel_adsp_ace30_ptl_sim.conf @@ -55,7 +55,6 @@ CONFIG_INTEL_ADSP_IPC=y # Temporary disabled options -CONFIG_TRACE=n CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=n CONFIG_PM_DEVICE_POWER_DOMAIN=n diff --git a/app/boards/intel_adsp_cavs25.conf b/app/boards/intel_adsp_cavs25.conf index 1117c66437e4..72104567491a 100644 --- a/app/boards/intel_adsp_cavs25.conf +++ b/app/boards/intel_adsp_cavs25.conf @@ -35,9 +35,7 @@ CONFIG_INTEL_MODULES=y CONFIG_LIBRARY_MANAGER=n # SOF / logging -CONFIG_TRACE=n CONFIG_SOF_LOG_LEVEL_INF=y -CONFIG_ZEPHYR_LOG=y # Zephyr / OS features CONFIG_DEBUG_COREDUMP=y diff --git a/app/boards/intel_adsp_cavs25_tgph.conf b/app/boards/intel_adsp_cavs25_tgph.conf index 83dea362fb06..b29a7ba18970 100644 --- a/app/boards/intel_adsp_cavs25_tgph.conf +++ b/app/boards/intel_adsp_cavs25_tgph.conf @@ -34,9 +34,7 @@ CONFIG_INTEL_MODULES=y CONFIG_LIBRARY_MANAGER=n # SOF / logging -CONFIG_TRACE=n CONFIG_SOF_LOG_LEVEL_INF=y -CONFIG_ZEPHYR_LOG=y # Zephyr / OS features CONFIG_DEBUG_COREDUMP=y diff --git a/app/boards/native_sim_libfuzzer.conf b/app/boards/native_sim_libfuzzer.conf index 631130f99fc3..2d0f82843202 100644 --- a/app/boards/native_sim_libfuzzer.conf +++ b/app/boards/native_sim_libfuzzer.conf @@ -8,9 +8,3 @@ CONFIG_SYS_HEAP_BIG_ONLY=y CONFIG_ZEPHYR_NATIVE_DRIVERS=y CONFIG_ARCH_POSIX_LIBFUZZER=y CONFIG_ZEPHYR_POSIX_FUZZ_TICKS=100 - -# Override incompatible options found in sof/app/prj.conf -# to silence build time warnings -# (strange why these are in app/prj.conf but not our problem here) -CONFIG_SMP_BOOT_DELAY=n -CONFIG_SCHED_CPU_MASK_PIN_ONLY=n diff --git a/app/prj.conf b/app/prj.conf index cd182e5be16c..e072f1df2fd2 100644 --- a/app/prj.conf +++ b/app/prj.conf @@ -15,6 +15,8 @@ CONFIG_HAVE_AGENT=n # We need more time to test and evaluate. CONFIG_MINIMAL_LIBC=y +CONFIG_ZEPHYR_LOG=y +CONFIG_TRACE=n CONFIG_LOG=y CONFIG_LOG_PRINTK=y # Log processing is offloaded to a low-priority thread. @@ -41,12 +43,6 @@ CONFIG_COMPILER_OPT="-fstrict-overflow" CONFIG_SCHED_DEADLINE=y CONFIG_SCHED_CPU_MASK=y -CONFIG_SMP_BOOT_DELAY=y - -# SOF code assumes system work queue and other system -# wide threads are pinned to a single core. -# CPU_MASK_PIN_ONLY must be set for all SOF builds. -CONFIG_SCHED_CPU_MASK_PIN_ONLY=y # Fix the sys ticks value until following bugs are solved: # - https://github.com/zephyrproject-rtos/zephyr/issues/46378