Skip to content

Commit

Permalink
zephyr: namespace the generated version.h
Browse files Browse the repository at this point in the history
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 <ycsin@meta.com>
  • Loading branch information
ycsin committed May 24, 2024
1 parent c11a318 commit 92174f4
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/init/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/trace/dma-trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <sof_versions.h>

#ifdef __ZEPHYR__
#include <version.h>
#include <zephyr/version.h>
#endif

#include <errno.h>
Expand Down
2 changes: 1 addition & 1 deletion zephyr/lib/alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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>

Expand Down
2 changes: 1 addition & 1 deletion zephyr/lib/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <rtos/alloc.h>

/* Zephyr includes */
#include <version.h>
#include <zephyr/version.h>
#include <zephyr/kernel.h>
#include <zephyr/kernel/smp.h>
#include <zephyr/device.h>
Expand Down
2 changes: 1 addition & 1 deletion zephyr/wrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 92174f4

Please sign in to comment.