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 <[email protected]>
andyross · Dec 17, 2024 · b73d53e · b73d53e
1 parent f5702db
commit b73d53e
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 32 deletions.
diff --git a/app/Kconfig 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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