zephyr: namespace the generated version.h

Zephyr's build time generated `version.h` is now in the `zephyr` to provide proper namespace, update the includes of this module accordingly. Signed-off-by: Yong Cong Sin <[email protected]>
thesofproject · Nov 9, 2023 · c74f38d · c74f38d
1 parent 49377e8
commit c74f38d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/app/prj.conf b/app/prj.conf
@@ -56,3 +56,6 @@ CONFIG_SCHED_CPU_MASK_PIN_ONLY=y
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=15000
 CONFIG_DAI=y
 CONFIG_HEAP_MEM_POOL_SIZE=2048
+
+# To be able to use Zephyr legacy include paths
+CONFIG_COMPAT_INCLUDES=y
diff --git a/src/init/init.c b/src/init/init.c
@@ -38,7 +38,7 @@
 #include <zephyr/logging/log_ctrl.h>
 #include <user/abi_dbg.h>
 #include <sof_versions.h>
-#include <version.h>
+#include <zephyr/version.h>
 #endif
 #include <sof/lib/ams.h>
 

diff --git a/src/trace/dma-trace.c b/src/trace/dma-trace.c
@@ -29,7 +29,7 @@
 #include <sof_versions.h>
 
 #ifdef __ZEPHYR__
-#include <version.h>
+#include <zephyr/version.h>
 #endif
 
 #include <errno.h>

diff --git a/zephyr/lib/alloc.c b/zephyr/lib/alloc.c
@@ -23,7 +23,7 @@
 #include <zephyr/init.h>
 #include <zephyr/kernel.h>
 #include <zephyr/pm/policy.h>
-#include <version.h>
+#include <zephyr/version.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/cache.h>
 

diff --git a/zephyr/lib/cpu.c b/zephyr/lib/cpu.c
@@ -17,8 +17,12 @@
 #include <rtos/alloc.h>
 
 /* Zephyr includes */
-#include <version.h>
+#include <zephyr/version.h>
+#ifdef CONFIG_COMPAT_INCLUDES
+#include <kernel.h>
+#else
 #include <zephyr/kernel.h>
+#endif
 #include <zephyr/device.h>
 #include <zephyr/drivers/mm/mm_drv_intel_adsp_mtl_tlb.h>
 

diff --git a/zephyr/wrapper.c b/zephyr/wrapper.c
@@ -29,7 +29,7 @@
 #include <zephyr/kernel_structs.h>
 #include <zephyr/kernel.h>
 #include <zephyr/pm/policy.h>
-#include <version.h>
+#include <zephyr/version.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/logging/log.h>