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]>

app/Kconfig

@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Copyright(c) 2023 Meta
+#
+# Author: Yong Cong Sin <[email protected]>
+
+menu "Compatibility"
+
+config SOF_COMPAT_INCLUDES
+	bool "Use legacy include path"
+	default n
+	help
+	  Use legacy Zephyr generated include paths,
+	  i.e. `#include <version.h> instead of:
+	  `#include <zephyr/version.h>`
+
+endmenu
+
+source "Kconfig"

app/prj.conf

@@ -57,3 +57,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=2048
 CONFIG_LLEXT=y
 CONFIG_LLEXT_STORAGE_WRITABLE=y
 CONFIG_MODULES=y
+
+# To be able to use Zephyr legacy include paths
+CONFIG_SOF_COMPAT_INCLUDES=y

src/init/init.c

@@ -40,7 +40,11 @@
 #include <zephyr/logging/log_ctrl.h>
 #include <user/abi_dbg.h>
 #include <sof_versions.h>
+#ifdef CONFIG_SOF_COMPAT_INCLUDES
 #include <version.h>
+#else
+#include <zephyr/version.h>
+#endif
 #endif
 #include <sof/lib/ams.h>
 

src/trace/dma-trace.c

@@ -30,7 +30,11 @@
 #include <sof_versions.h>
 
 #ifdef __ZEPHYR__
+#ifdef CONFIG_SOF_COMPAT_INCLUDES
 #include <version.h>
+#else
+#include <zephyr/version.h>
+#endif
 #endif
 
 #include <errno.h>

zephyr/lib/alloc.c

@@ -23,7 +23,11 @@
 #include <zephyr/init.h>
 #include <zephyr/kernel.h>
 #include <zephyr/pm/policy.h>
+#ifdef CONFIG_SOF_COMPAT_INCLUDES
 #include <version.h>
+#else
+#include <zephyr/version.h>
+#endif
 #include <zephyr/sys/__assert.h>
 #include <zephyr/cache.h>
 

zephyr/lib/cpu.c

@@ -17,7 +17,11 @@
 #include <rtos/alloc.h>
 
 /* Zephyr includes */
+#ifdef CONFIG_SOF_COMPAT_INCLUDES
 #include <version.h>
+#else
+#include <zephyr/version.h>
+#endif
 #include <zephyr/kernel.h>
 #include <zephyr/kernel/smp.h>
 #include <zephyr/device.h>

zephyr/wrapper.c

@@ -28,7 +28,11 @@
 #include <zephyr/kernel_structs.h>
 #include <zephyr/kernel.h>
 #include <zephyr/pm/policy.h>
+#ifdef CONFIG_SOF_COMPAT_INCLUDES
 #include <version.h>
+#else
+#include <zephyr/version.h>
+#endif
 #include <zephyr/sys/__assert.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/logging/log.h>