Skip to content

Commit 8ca7b6a

Browse files
committed
build: namespace the generated headers with zephyr/`
Zephyr's build time generated headers are now in the `zephyr` to provide proper namespace, update the path accordingly. See ZephyrProject upstream PR at: zephyrproject-rtos/zephyr#63973 Signed-off-by: Yong Cong Sin <ycsin@meta.com>
1 parent c11a318 commit 8ca7b6a

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

src/init/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include <zephyr/logging/log_ctrl.h>
3939
#include <user/abi_dbg.h>
4040
#include <sof_versions.h>
41-
#include <version.h>
41+
#include <zephyr/version.h>
4242
#endif
4343
#include <sof/lib/ams.h>
4444

src/ipc/ipc-zephyr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// Andrey Borisovich <andrey.borisovich@intel.com>
1010
// Adrian Warecki <adrian.warecki@intel.com>
1111

12-
#include <autoconf.h>
12+
#include <zephyr/autoconf.h>
1313

1414
#include <intel_adsp_ipc.h>
1515
#include <sof/ipc/common.h>

src/trace/dma-trace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <sof_versions.h>
3030

3131
#ifdef __ZEPHYR__
32-
#include <version.h>
32+
#include <zephyr/version.h>
3333
#endif
3434

3535
#include <errno.h>

zephyr/lib/alloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <zephyr/init.h>
2525
#include <zephyr/kernel.h>
2626
#include <zephyr/pm/policy.h>
27-
#include <version.h>
27+
#include <zephyr/version.h>
2828
#include <zephyr/sys/__assert.h>
2929
#include <zephyr/cache.h>
3030

zephyr/lib/cpu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <rtos/alloc.h>
1818

1919
/* Zephyr includes */
20-
#include <version.h>
20+
#include <zephyr/version.h>
2121
#include <zephyr/kernel.h>
2222
#include <zephyr/kernel/smp.h>
2323
#include <zephyr/device.h>

zephyr/wrapper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <zephyr/kernel_structs.h>
3030
#include <zephyr/kernel.h>
3131
#include <zephyr/pm/policy.h>
32-
#include <version.h>
32+
#include <zephyr/version.h>
3333
#include <zephyr/sys/__assert.h>
3434
#include <zephyr/logging/log_ctrl.h>
3535
#include <zephyr/logging/log.h>

0 commit comments

Comments
 (0)