diff --git a/CMakeLists.txt b/CMakeLists.txt index e40bb61d879aa50..c29c6189a13d785 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -568,9 +568,9 @@ add_custom_target(version_h DEPENDS ${PROJECT_BINARY_DIR}/include/generated/zeph if(EXISTS ${APPLICATION_SOURCE_DIR}/VERSION) add_custom_command( - OUTPUT ${PROJECT_BINARY_DIR}/include/generated/app_version.h + OUTPUT ${PROJECT_BINARY_DIR}/include/generated/zephyr/app_version.h COMMAND ${CMAKE_COMMAND} -DZEPHYR_BASE=${ZEPHYR_BASE} - -DOUT_FILE=${PROJECT_BINARY_DIR}/include/generated/app_version.h + -DOUT_FILE=${PROJECT_BINARY_DIR}/include/generated/zephyr/app_version.h -DVERSION_TYPE=APP -DVERSION_FILE=${APPLICATION_SOURCE_DIR}/VERSION -DAPP_VERSION_CUSTOMIZATION="${APP_VERSION_CUSTOMIZATION}" @@ -578,7 +578,9 @@ if(EXISTS ${APPLICATION_SOURCE_DIR}/VERSION) -P ${ZEPHYR_BASE}/cmake/gen_version_h.cmake DEPENDS ${APPLICATION_SOURCE_DIR}/VERSION ${git_dependency} ) - add_custom_target(app_version_h DEPENDS ${PROJECT_BINARY_DIR}/include/generated/app_version.h) + add_custom_target( + app_version_h + DEPENDS ${PROJECT_BINARY_DIR}/include/generated/zephyr/app_version.h) add_dependencies(zephyr_interface app_version_h) endif() @@ -631,7 +633,7 @@ set(ZEPHYR_CURRENT_CMAKE_DIR) get_property(LIBC_LINK_LIBRARIES TARGET zephyr_interface PROPERTY LIBC_LINK_LIBRARIES) zephyr_link_libraries(${LIBC_LINK_LIBRARIES}) -set(syscall_list_h ${CMAKE_CURRENT_BINARY_DIR}/include/generated/syscall_list.h) +set(syscall_list_h ${CMAKE_CURRENT_BINARY_DIR}/include/generated/zephyr/syscall_list.h) set(syscalls_json ${CMAKE_CURRENT_BINARY_DIR}/misc/generated/syscalls.json) set(struct_tags_json ${CMAKE_CURRENT_BINARY_DIR}/misc/generated/struct_tags.json) @@ -801,7 +803,7 @@ add_custom_command(OUTPUT include/generated/syscall_dispatch.c ${syscall_list_h} # This is passed into all calls to the gen_kobject_list.py script. set(gen_kobject_list_include_args --include-subsystem-list ${struct_tags_json}) -set(DRV_VALIDATION ${PROJECT_BINARY_DIR}/include/generated/driver-validation.h) +set(DRV_VALIDATION ${PROJECT_BINARY_DIR}/include/generated/zephyr/driver-validation.h) add_custom_command( OUTPUT ${DRV_VALIDATION} COMMAND @@ -834,7 +836,7 @@ add_dependencies(zephyr_generated_headers set(OFFSETS_LIB offsets) set(OFFSETS_C_PATH ${ARCH_DIR}/${ARCH}/core/offsets/offsets.c) -set(OFFSETS_H_PATH ${PROJECT_BINARY_DIR}/include/generated/offsets.h) +set(OFFSETS_H_PATH ${PROJECT_BINARY_DIR}/include/generated/zephyr/offsets.h) add_library( ${OFFSETS_LIB} OBJECT ${OFFSETS_C_PATH}) target_include_directories(${OFFSETS_LIB} PRIVATE diff --git a/arch/arc/include/offsets_short_arch.h b/arch/arc/include/offsets_short_arch.h index 5bf2c23fc3a363d..f461112ae792623 100644 --- a/arch/arc/include/offsets_short_arch.h +++ b/arch/arc/include/offsets_short_arch.h @@ -7,7 +7,7 @@ #ifndef ZEPHYR_ARCH_ARC_INCLUDE_OFFSETS_SHORT_ARCH_H_ #define ZEPHYR_ARCH_ARC_INCLUDE_OFFSETS_SHORT_ARCH_H_ -#include +#include /* kernel */ diff --git a/arch/arm/include/offsets_short_arch.h b/arch/arm/include/offsets_short_arch.h index 78a2607655c8834..8baa9bbf9bb3188 100644 --- a/arch/arm/include/offsets_short_arch.h +++ b/arch/arm/include/offsets_short_arch.h @@ -7,7 +7,7 @@ #ifndef ZEPHYR_ARCH_ARM_INCLUDE_OFFSETS_SHORT_ARCH_H_ #define ZEPHYR_ARCH_ARM_INCLUDE_OFFSETS_SHORT_ARCH_H_ -#include +#include /* kernel */ diff --git a/arch/arm64/core/reset.S b/arch/arm64/core/reset.S index 9b3b4462e851abf..32f0bde6cce3db5 100644 --- a/arch/arm64/core/reset.S +++ b/arch/arm64/core/reset.S @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include "boot.h" #include "macro_priv.inc" diff --git a/arch/arm64/core/vector_table.S b/arch/arm64/core/vector_table.S index 1a1b649d4f2951f..499dbd292a53a6d 100644 --- a/arch/arm64/core/vector_table.S +++ b/arch/arm64/core/vector_table.S @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm64/include/offsets_short_arch.h b/arch/arm64/include/offsets_short_arch.h index abd93bba7baceb7..11dd5f642561d5b 100644 --- a/arch/arm64/include/offsets_short_arch.h +++ b/arch/arm64/include/offsets_short_arch.h @@ -7,7 +7,7 @@ #ifndef ZEPHYR_ARCH_ARM64_INCLUDE_OFFSETS_SHORT_ARCH_H_ #define ZEPHYR_ARCH_ARM64_INCLUDE_OFFSETS_SHORT_ARCH_H_ -#include +#include #define _thread_offset_to_exception_depth \ (___thread_t_arch_OFFSET + ___thread_arch_t_exception_depth_OFFSET) diff --git a/arch/mips/include/offsets_short_arch.h b/arch/mips/include/offsets_short_arch.h index bd64deef114f52e..8440f0ff7013719 100644 --- a/arch/mips/include/offsets_short_arch.h +++ b/arch/mips/include/offsets_short_arch.h @@ -9,7 +9,7 @@ #ifndef ZEPHYR_ARCH_MIPS_INCLUDE_OFFSETS_SHORT_ARCH_H_ #define ZEPHYR_ARCH_MIPS_INCLUDE_OFFSETS_SHORT_ARCH_H_ -#include +#include #define _thread_offset_to_sp \ (___thread_t_callee_saved_OFFSET + ___callee_saved_t_sp_OFFSET) diff --git a/arch/nios2/include/offsets_short_arch.h b/arch/nios2/include/offsets_short_arch.h index b3f60972c3b883d..3b961e1fcb92c3f 100644 --- a/arch/nios2/include/offsets_short_arch.h +++ b/arch/nios2/include/offsets_short_arch.h @@ -7,7 +7,7 @@ #ifndef ZEPHYR_ARCH_NIOS2_INCLUDE_OFFSETS_SHORT_ARCH_H_ #define ZEPHYR_ARCH_NIOS2_INCLUDE_OFFSETS_SHORT_ARCH_H_ -#include +#include /* kernel */ diff --git a/arch/posix/include/offsets_short_arch.h b/arch/posix/include/offsets_short_arch.h index b33414b3f6e1b67..5281d68e092d5c0 100644 --- a/arch/posix/include/offsets_short_arch.h +++ b/arch/posix/include/offsets_short_arch.h @@ -7,7 +7,7 @@ #ifndef ZEPHYR_ARCH_POSIX_INCLUDE_OFFSETS_SHORT_ARCH_H_ #define ZEPHYR_ARCH_POSIX_INCLUDE_OFFSETS_SHORT_ARCH_H_ -#include +#include /* kernel */ diff --git a/arch/riscv/core/fpu.S b/arch/riscv/core/fpu.S index 2708d11fec1c495..981bd576cb77365 100644 --- a/arch/riscv/core/fpu.S +++ b/arch/riscv/core/fpu.S @@ -7,7 +7,7 @@ #include #include -#include +#include #ifdef CONFIG_CPU_HAS_FPU_DOUBLE_PRECISION #define LOAD fld diff --git a/arch/riscv/core/reset.S b/arch/riscv/core/reset.S index 094e51b91836e1e..c45c71f597ff92f 100644 --- a/arch/riscv/core/reset.S +++ b/arch/riscv/core/reset.S @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include "asm_macros.inc" /* exports */ diff --git a/arch/riscv/include/offsets_short_arch.h b/arch/riscv/include/offsets_short_arch.h index 3d3a878f16ea1ca..27c01a77461d30f 100644 --- a/arch/riscv/include/offsets_short_arch.h +++ b/arch/riscv/include/offsets_short_arch.h @@ -7,7 +7,7 @@ #ifndef ZEPHYR_ARCH_RISCV_INCLUDE_OFFSETS_SHORT_ARCH_H_ #define ZEPHYR_ARCH_RISCV_INCLUDE_OFFSETS_SHORT_ARCH_H_ -#include +#include #define _thread_offset_to_sp \ (___thread_t_callee_saved_OFFSET + ___callee_saved_t_sp_OFFSET) diff --git a/arch/sparc/include/offsets_short_arch.h b/arch/sparc/include/offsets_short_arch.h index c53f2b3705beaf3..0f9272f332b6695 100644 --- a/arch/sparc/include/offsets_short_arch.h +++ b/arch/sparc/include/offsets_short_arch.h @@ -7,7 +7,7 @@ #ifndef ZEPHYR_ARCH_SPARC_INCLUDE_OFFSETS_SHORT_ARCH_H_ #define ZEPHYR_ARCH_SPARC_INCLUDE_OFFSETS_SHORT_ARCH_H_ -#include +#include #define _thread_offset_to_y \ (___thread_t_callee_saved_OFFSET + ___callee_saved_t_y_OFFSET) diff --git a/arch/x86/include/ia32/offsets_short_arch.h b/arch/x86/include/ia32/offsets_short_arch.h index 2033a5585f7110b..cb5cdb218f0ae90 100644 --- a/arch/x86/include/ia32/offsets_short_arch.h +++ b/arch/x86/include/ia32/offsets_short_arch.h @@ -7,7 +7,7 @@ #ifndef ZEPHYR_ARCH_X86_INCLUDE_IA32_OFFSETS_SHORT_ARCH_H_ #define ZEPHYR_ARCH_X86_INCLUDE_IA32_OFFSETS_SHORT_ARCH_H_ -#include +#include /* kernel */ diff --git a/arch/x86/include/intel64/offsets_short_arch.h b/arch/x86/include/intel64/offsets_short_arch.h index 4252ac687dba79b..1ffabc899c2045e 100644 --- a/arch/x86/include/intel64/offsets_short_arch.h +++ b/arch/x86/include/intel64/offsets_short_arch.h @@ -6,7 +6,7 @@ #ifndef ZEPHYR_ARCH_X86_INCLUDE_INTEL64_OFFSETS_SHORT_ARCH_H_ #define ZEPHYR_ARCH_X86_INCLUDE_INTEL64_OFFSETS_SHORT_ARCH_H_ -#include +#include #define _thread_offset_to_rsp \ (___thread_t_callee_saved_OFFSET + ___callee_saved_t_rsp_OFFSET) diff --git a/arch/xtensa/core/CMakeLists.txt b/arch/xtensa/core/CMakeLists.txt index 3bf29e88b6499fe..53e0f69788c6c02 100644 --- a/arch/xtensa/core/CMakeLists.txt +++ b/arch/xtensa/core/CMakeLists.txt @@ -39,7 +39,7 @@ add_subdirectory(startup) # are the official places where we find core-isa.h. (Also that we # undefine __XCC_ because that compiler actually trips an error trying # to build this file to protect against mismatched versions.) -set(CORE_ISA_DM ${CMAKE_BINARY_DIR}/zephyr/include/generated/core-isa-dM.h) +set(CORE_ISA_DM ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/core-isa-dM.h) set(CORE_ISA_IN ${CMAKE_BINARY_DIR}/zephyr/include/generated/core-isa-dM.c) file(WRITE ${CORE_ISA_IN} "#include \n") add_custom_command(OUTPUT ${CORE_ISA_DM} @@ -49,7 +49,7 @@ add_custom_command(OUTPUT ${CORE_ISA_DM} ${CORE_ISA_IN} -o ${CORE_ISA_DM}) # Generates a list of device-specific scratch register choices -set(ZSR_H ${CMAKE_BINARY_DIR}/zephyr/include/generated/zsr.h) +set(ZSR_H ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/zsr.h) add_custom_command(OUTPUT ${ZSR_H} DEPENDS ${CORE_ISA_DM} COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gen_zsr.py ${CORE_ISA_DM} ${ZSR_H}) diff --git a/arch/xtensa/core/coredump.c b/arch/xtensa/core/coredump.c index 26060dea8c34204..18e1d2c4a5978fc 100644 --- a/arch/xtensa/core/coredump.c +++ b/arch/xtensa/core/coredump.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #define ARCH_HDR_VER 1 #define XTENSA_BLOCK_HDR_VER 2 diff --git a/arch/xtensa/core/debug_helpers_asm.S b/arch/xtensa/core/debug_helpers_asm.S index 8d895ba39ddd52f..d4d455970735c55 100644 --- a/arch/xtensa/core/debug_helpers_asm.S +++ b/arch/xtensa/core/debug_helpers_asm.S @@ -10,7 +10,7 @@ #include #include -#include +#include .section .iram1, "ax" .align 4 diff --git a/arch/xtensa/core/irq_offload.c b/arch/xtensa/core/irq_offload.c index 614caf39be88b5c..ec5234c3a1c41a1 100644 --- a/arch/xtensa/core/irq_offload.c +++ b/arch/xtensa/core/irq_offload.c @@ -5,7 +5,7 @@ #include #include -#include +#include #include #define CURR_CPU (IS_ENABLED(CONFIG_SMP) ? arch_curr_cpu()->id : 0) diff --git a/arch/xtensa/core/window_vectors.S b/arch/xtensa/core/window_vectors.S index a63923cbd6fc2dd..fbe166c240e3286 100644 --- a/arch/xtensa/core/window_vectors.S +++ b/arch/xtensa/core/window_vectors.S @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ #include -#include +#include /* WINDOW OVERFLOW AND UNDERFLOW EXCEPTION VECTORS AND ALLOCA EXCEPTION * HANDLER diff --git a/arch/xtensa/core/xtensa-asm2-util.S b/arch/xtensa/core/xtensa-asm2-util.S index d7ba88aaffc397c..4fa71392c2f9f62 100644 --- a/arch/xtensa/core/xtensa-asm2-util.S +++ b/arch/xtensa/core/xtensa-asm2-util.S @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ #include -#include -#include +#include +#include #if defined(CONFIG_SIMULATOR_XTENSA) || defined(XT_SIMULATOR) #include diff --git a/arch/xtensa/core/xtensa-asm2.c b/arch/xtensa/core/xtensa-asm2.c index c2371ac8f55d6a3..af930081d323dff 100644 --- a/arch/xtensa/core/xtensa-asm2.c +++ b/arch/xtensa/core/xtensa-asm2.c @@ -13,8 +13,8 @@ #include <_soc_inthandlers.h> #include #include -#include -#include +#include +#include LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL); diff --git a/arch/xtensa/include/kernel_arch_func.h b/arch/xtensa/include/kernel_arch_func.h index 6427b306e623190..09a06fcaccc1c9d 100644 --- a/arch/xtensa/include/kernel_arch_func.h +++ b/arch/xtensa/include/kernel_arch_func.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/arch/xtensa/include/xtensa-asm2-s.h b/arch/xtensa/include/xtensa-asm2-s.h index f691dbc6cad9b14..4892f1daef58741 100644 --- a/arch/xtensa/include/xtensa-asm2-s.h +++ b/arch/xtensa/include/xtensa-asm2-s.h @@ -7,10 +7,10 @@ #ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_S_H #define ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_S_H -#include +#include #include "xtensa-asm2-context.h" -#include +#include /* Assembler header! This file contains macros designed to be included * only by the assembler. diff --git a/boards/x86/qemu_x86/qemu_x86_tiny.ld b/boards/x86/qemu_x86/qemu_x86_tiny.ld index c53e2a7b409804f..008378767b93a11 100644 --- a/boards/x86/qemu_x86/qemu_x86_tiny.ld +++ b/boards/x86/qemu_x86/qemu_x86_tiny.ld @@ -6,7 +6,7 @@ */ #include -#include +#include #include #include #include diff --git a/cmake/ide/eclipse_cdt4_generator_amendment.cmake b/cmake/ide/eclipse_cdt4_generator_amendment.cmake index 1bad729118e377b..36eca028335d5c7 100644 --- a/cmake/ide/eclipse_cdt4_generator_amendment.cmake +++ b/cmake/ide/eclipse_cdt4_generator_amendment.cmake @@ -9,7 +9,7 @@ # # Solution: # The amendment function generates a macro header file -# ${CMAKE_BINARY_DIR}/zephyr/include/generated/cmake_intdef.h +# ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/cmake_intdef.h # based on INTERFACE_COMPILE_DEFINITIONS and appends the # defines from the file to # CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS. @@ -46,7 +46,7 @@ # CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS. # #3. The amendment function appends the defines from -# ${CMAKE_BINARY_DIR}/zephyr/include/generated/autoconf.h to +# ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/autoconf.h to # CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS. # function(eclipse_cdt4_generator_amendment _param_defs) @@ -88,7 +88,7 @@ else(${_param_defs} EQUAL 1) message(" ${_work_mode}") endif(${_param_defs} EQUAL 1) -set(OUTPUT_FILE ${CMAKE_BINARY_DIR}/zephyr/include/generated/cmake_intdef.h) +set(OUTPUT_FILE ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/cmake_intdef.h) file(WRITE ${OUTPUT_FILE} "/* Generated by eclipse_cd4_generator_amendment.cmake */\n") file(APPEND ${OUTPUT_FILE} "/* The header contains the defines collected from the */\n") file(APPEND ${OUTPUT_FILE} "/* INTERFACE_COMPILE_DEFINITIONS target property */\n") @@ -104,7 +104,7 @@ if (${_work_mode} STREQUAL "C and CXX includes, defines in Eclipse with project message(" -------------------------------------------------------------------------") message(" Add the following two command line parameters:") message("") - message(" -imacros ${CMAKE_BINARY_DIR}/zephyr/include/generated/cmake_intdef.h") + message(" -imacros ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/cmake_intdef.h") message(" -imacros ${AUTOCONF_H}") message("") message(" to 'CDT cross GCC Built-in Compiler Settings' provider command definition") @@ -125,7 +125,7 @@ if ( (${_work_mode} STREQUAL "C and CXX includes, defines in .settings - [EXPERI file(APPEND ${OUTPUT_FILE} "\t\t\t\n") file(APPEND ${OUTPUT_FILE} "\t\t\t\n") if (${_work_mode} STREQUAL "C and CXX includes, defines in .settings with project defines - [EXPERIMENTAL]") - file(APPEND ${OUTPUT_FILE} "\t\t\t\n") + file(APPEND ${OUTPUT_FILE} "\t\t\t\n") else () file(APPEND ${OUTPUT_FILE} "\t\t\t\n") endif () @@ -167,7 +167,7 @@ if ( (${_work_mode} STREQUAL "C and CXX includes, defines in .cproject without _ endif() - file(STRINGS ${CMAKE_BINARY_DIR}/zephyr/include/generated/cmake_intdef.h _int_comp_def) + file(STRINGS ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/cmake_intdef.h _int_comp_def) set (_resultDefines "${CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS}") foreach( d ${_int_comp_def} ) string(REGEX MATCH "^#define +([A-Za-z_][A-Za-z0-9_]*) *(.*) *$" _dummy "${d}") diff --git a/cmake/kobj.cmake b/cmake/kobj.cmake index dc693509b119df7..f6c1bf006cbd638 100644 --- a/cmake/kobj.cmake +++ b/cmake/kobj.cmake @@ -2,9 +2,9 @@ function(gen_kobj gen_dir_out) if (PROJECT_BINARY_DIR) - set(gen_dir ${PROJECT_BINARY_DIR}/include/generated) + set(gen_dir ${PROJECT_BINARY_DIR}/include/generated/zephyr) else () - set(gen_dir ${CMAKE_BINARY_DIR}/include/generated) + set(gen_dir ${CMAKE_BINARY_DIR}/include/generated/zephyr) endif () set(KOBJ_TYPES ${gen_dir}/kobj-types-enum.h) diff --git a/cmake/modules/generated_file_directories.cmake b/cmake/modules/generated_file_directories.cmake index aac3b39a6f9bef4..e78e05255e86369 100644 --- a/cmake/modules/generated_file_directories.cmake +++ b/cmake/modules/generated_file_directories.cmake @@ -19,6 +19,6 @@ include_guard(GLOBAL) # Optional environment variables: # None -set(BINARY_DIR_INCLUDE ${PROJECT_BINARY_DIR}/include/generated) -set(BINARY_DIR_INCLUDE_GENERATED ${PROJECT_BINARY_DIR}/include/generated) +set(BINARY_DIR_INCLUDE ${PROJECT_BINARY_DIR}/include/generated/zephyr) +set(BINARY_DIR_INCLUDE_GENERATED ${PROJECT_BINARY_DIR}/include/generated/zephyr) file(MAKE_DIRECTORY ${BINARY_DIR_INCLUDE_GENERATED}) diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake index 632e9a724229685..b2e6fccf07de062 100644 --- a/cmake/modules/kconfig.cmake +++ b/cmake/modules/kconfig.cmake @@ -5,10 +5,11 @@ include_guard(GLOBAL) include(extensions) include(python) -# autoconf.h is generated by Kconfig and placed in /zephyr/include/generated/autoconf.h. +# autoconf.h is generated by Kconfig and placed in +# /zephyr/include/generated/zephyr/autoconf.h. # A project may request a custom location by setting AUTOCONF_H explicitly before # calling 'find_package(Zephyr)' or loading this module. -set_ifndef(AUTOCONF_H ${PROJECT_BINARY_DIR}/include/generated/autoconf.h) +set_ifndef(AUTOCONF_H ${PROJECT_BINARY_DIR}/include/generated/zephyr/autoconf.h) # Re-configure (Re-execute all CMakeLists.txt code) when autoconf.h changes set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${AUTOCONF_H}) diff --git a/doc/build/cmake/index.rst b/doc/build/cmake/index.rst index 479e044b68e2cc6..28d3b795aaf7968 100644 --- a/doc/build/cmake/index.rst +++ b/doc/build/cmake/index.rst @@ -88,7 +88,7 @@ Devicetree The preprocessed devicetree sources are parsed by :zephyr_file:`gen_defines.py ` to generate a - :file:`build/zephyr/include/generated/devicetree_generated.h` header with + :file:`build/zephyr/include/generated/zephyr/devicetree_generated.h` header with preprocessor macros. Source code should access preprocessor macros generated from devicetree by diff --git a/doc/build/dts/howtos.rst b/doc/build/dts/howtos.rst index 02580ad223dacd0..010e6b24bed08c2 100644 --- a/doc/build/dts/howtos.rst +++ b/doc/build/dts/howtos.rst @@ -42,7 +42,7 @@ CMake prints the input and output file locations like this: -- Found BOARD.dts: .../zephyr/boards/arm/qemu_cortex_m3/qemu_cortex_m3.dts -- Generated zephyr.dts: .../zephyr/build/zephyr/zephyr.dts - -- Generated devicetree_generated.h: .../zephyr/build/zephyr/include/generated/devicetree_generated.h + -- Generated devicetree_generated.h: .../zephyr/build/zephyr/include/generated/zephyr/devicetree_generated.h The :file:`zephyr.dts` file is the final devicetree in DTS format. diff --git a/doc/build/dts/intro-input-output.rst b/doc/build/dts/intro-input-output.rst index 7b2c2a1119c8c4a..12378a3a1d0c366 100644 --- a/doc/build/dts/intro-input-output.rst +++ b/doc/build/dts/intro-input-output.rst @@ -127,7 +127,7 @@ These are created in your application's build directory. input to :file:`gen_defines.py` and used to create :file:`zephyr.dts` and :file:`devicetree_generated.h`. -:file:`/zephyr/include/generated/devicetree_generated.h` +:file:`/zephyr/include/generated/zephyr/devicetree_generated.h` The generated macros and additional comments describing the devicetree. Included by ``devicetree.h``. diff --git a/doc/build/dts/troubleshooting.rst b/doc/build/dts/troubleshooting.rst index 563ce04aac5c654..940c05ad0fb4648 100644 --- a/doc/build/dts/troubleshooting.rst +++ b/doc/build/dts/troubleshooting.rst @@ -66,7 +66,7 @@ Below, ```` means your build directory. To find the devicetree node you need to check, use the number ```` from the linker error. Look for this number in the list of nodes at the top of -:file:`/zephyr/include/generated/devicetree_generated.h`. For example, if +:file:`/zephyr/include/generated/zephyr/devicetree_generated.h`. For example, if ```` is 15, and your :file:`devicetree_generated.h` file looks like this, the node you are interested in is ``/soc/i2c@deadbeef``: diff --git a/doc/build/dts/zephyr_dt_inputs_outputs.svg b/doc/build/dts/zephyr_dt_inputs_outputs.svg index 833353aa654c8a0..3aace1d0fb8fe97 100644 --- a/doc/build/dts/zephyr_dt_inputs_outputs.svg +++ b/doc/build/dts/zephyr_dt_inputs_outputs.svg @@ -1,4 +1,4 @@ -
FILE_1.overlay
...
FILE_n.overlay
FILE_1.overlay...
Devicetree overlays:
optional DTS format files
which override <BOARD>.dts.
Devi...
In board directory.
The "base" devicetree.
Includes SoC .dtsi file,
may include other files.
In...
<BOARD>.dts
<BOARD>.dts
BINDING_1.yaml
...
BINDING_n.yaml
BINDING_1.yaml...
Devicetree bindings:
contain rules for devicetree's
contents.
Devi...
Devicetree scripts in scripts/dts/
Devicetree scri...
Intermediate output in build/zephyr/. C preprocessor output of including <BOARD>.dts and overlays.
Intermediate output in bu...
Generated C header files, in
build/zephyr/include/generated/.

Access these via <devicetree.h>
Gene...
Generated C headers
Generated C headers
zephyr.dts.pre
zephyr.dts.pre
zephyr.dts
zephyr.dts
Final merged devicetree in
build/zephyr/. Useful for debugging. Passed to dtc if it is installed.
Final merged devicetree i...
dtc (optional, just for errors/warnings)
dtc (optional, just...Viewer does not support full SVG 1.1 \ No newline at end of file +
FILE_1.overlay
...
FILE_n.overlay
FILE_1.overlay...
Devicetree overlays:
optional DTS format files
which override <BOARD>.dts.
Devi...
In board directory.
The "base" devicetree.
Includes SoC .dtsi file,
may include other files.
In...
<BOARD>.dts
<BOARD>.dts
BINDING_1.yaml
...
BINDING_n.yaml
BINDING_1.yaml...
Devicetree bindings:
contain rules for devicetree's
contents.
Devi...
Devicetree scripts in scripts/dts/
Devicetree scri...
Intermediate output in build/zephyr/. C preprocessor output of including <BOARD>.dts and overlays.
Intermediate output in bu...
Generated C header files, in
build/zephyr/include/generated/zephyr/.

Access these via <devicetree.h>
Gene...
Generated C headers
Generated C headers
zephyr.dts.pre
zephyr.dts.pre
zephyr.dts
zephyr.dts
Final merged devicetree in
build/zephyr/. Useful for debugging. Passed to dtc if it is installed.
Final merged devicetree i...
dtc (optional, just for errors/warnings)
dtc (optional, just...Viewer does not support full SVG 1.1 diff --git a/doc/kernel/usermode/syscalls.rst b/doc/kernel/usermode/syscalls.rst index af16fbd2e4f5aec..0ffdb48e71c8480 100644 --- a/doc/kernel/usermode/syscalls.rst +++ b/doc/kernel/usermode/syscalls.rst @@ -143,7 +143,7 @@ C and header files by the :ref:`gen_syscalls.py` script, all of which can be fou the project out directory under ``include/generated/``: * The system call is added to the enumerated type of system call IDs, - which is expressed in ``include/generated/syscall_list.h``. It is the name + which is expressed in ``include/generated/zephyr/syscall_list.h``. It is the name of the API in uppercase, prefixed with ``K_SYSCALL_``. * An entry for the system call is created in the dispatch table diff --git a/doc/services/retention/blinfo.rst b/doc/services/retention/blinfo.rst index 6f34b0f9a35643c..6d18b1d8688d488 100644 --- a/doc/services/retention/blinfo.rst +++ b/doc/services/retention/blinfo.rst @@ -122,7 +122,7 @@ this mode: #include #include - #include + #include #include API Reference diff --git a/include/zephyr/arch/x86/ia32/linker.ld b/include/zephyr/arch/x86/ia32/linker.ld index 4d3ebe03f850acd..42d75474a3ad53f 100644 --- a/include/zephyr/arch/x86/ia32/linker.ld +++ b/include/zephyr/arch/x86/ia32/linker.ld @@ -38,7 +38,7 @@ */ #include -#include +#include #include #include diff --git a/include/zephyr/arch/xtensa/arch_inlines.h b/include/zephyr/arch/xtensa/arch_inlines.h index d5fcc55af47c80a..9c4492dc22757a6 100644 --- a/include/zephyr/arch/xtensa/arch_inlines.h +++ b/include/zephyr/arch/xtensa/arch_inlines.h @@ -11,7 +11,7 @@ #ifndef _ASMLANGUAGE #include -#include +#include #define XTENSA_RSR(sr) \ ({uint32_t v; \ diff --git a/include/zephyr/device.h b/include/zephyr/device.h index ca59579500090b5..26500fb6c0837b1 100644 --- a/include/zephyr/device.h +++ b/include/zephyr/device.h @@ -90,7 +90,7 @@ typedef int16_t device_handle_t; * size. * * The ordinal used in this name can be mapped to the path by - * examining zephyr/include/generated/devicetree_generated.h. + * examining zephyr/include/generated/zephyr/devicetree_generated.h. */ #define Z_DEVICE_DT_DEV_ID(node_id) _CONCAT(dts_ord_, DT_DEP_ORD(node_id)) diff --git a/include/zephyr/devicetree.h b/include/zephyr/devicetree.h index c249ad371e2e4ae..720a5235f74d18c 100644 --- a/include/zephyr/devicetree.h +++ b/include/zephyr/devicetree.h @@ -16,7 +16,7 @@ #ifndef DEVICETREE_H #define DEVICETREE_H -#include +#include #if !defined(_LINKER) && !defined(_ASMLANGUAGE) #include diff --git a/include/zephyr/linker/kobject-data.ld b/include/zephyr/linker/kobject-data.ld index 26720dbff3388be..573680b235e7e77 100644 --- a/include/zephyr/linker/kobject-data.ld +++ b/include/zephyr/linker/kobject-data.ld @@ -30,7 +30,7 @@ */ #if defined(LINKER_ZEPHYR_PREBUILT) -#include +#include #ifdef CONFIG_DYNAMIC_OBJECTS /* This is produced by gperf. Put a place holder here @@ -45,7 +45,7 @@ #endif /* LINKER_ZEPHYR_PREBUILT */ #if defined(LINKER_ZEPHYR_FINAL) -#include +#include #ifdef KOBJECT_DATA_ALIGN . = ALIGN(KOBJECT_DATA_ALIGN); diff --git a/include/zephyr/linker/linker-defs.h b/include/zephyr/linker/linker-defs.h index f2737c7f6f2c215..ce5bf7fea8e38af 100644 --- a/include/zephyr/linker/linker-defs.h +++ b/include/zephyr/linker/linker-defs.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include /* We need to dummy out DT_NODE_HAS_STATUS when building the unittests. * Including devicetree.h would require generating dummy header files diff --git a/include/zephyr/sys/kobject.h b/include/zephyr/sys/kobject.h index c423a7496acad0d..a54370268b8ba18 100644 --- a/include/zephyr/sys/kobject.h +++ b/include/zephyr/sys/kobject.h @@ -35,7 +35,7 @@ enum k_objects { * generated during build by gen_kobject_list.py. It includes * basic kernel objects (e.g. pipes and mutexes) and driver types. */ -#include +#include /** @endcond */ diff --git a/include/zephyr/syscall.h b/include/zephyr/syscall.h index 73a3a648d2378b9..35cb36554a0a71d 100644 --- a/include/zephyr/syscall.h +++ b/include/zephyr/syscall.h @@ -8,7 +8,7 @@ #ifndef ZEPHYR_INCLUDE_SYSCALL_H_ #define ZEPHYR_INCLUDE_SYSCALL_H_ -#include +#include #include #include diff --git a/include/zephyr/syscall_handler.h b/include/zephyr/syscall_handler.h index 7e06c5a7a548a79..60e8fe02e6309f4 100644 --- a/include/zephyr/syscall_handler.h +++ b/include/zephyr/syscall_handler.h @@ -543,7 +543,7 @@ static inline int z_obj_validation_check(struct z_object *ko, #define Z_SYSCALL_OBJ_NEVER_INIT(ptr, type) \ Z_SYSCALL_IS_OBJ(ptr, type, _OBJ_INIT_FALSE) -#include +#include #endif /* _ASMLANGUAGE */ diff --git a/kernel/include/kernel_offsets.h b/kernel/include/kernel_offsets.h index f7676438d9eb70f..8bf32ab4eedeee1 100644 --- a/kernel/include/kernel_offsets.h +++ b/kernel/include/kernel_offsets.h @@ -10,7 +10,7 @@ #ifndef ZEPHYR_KERNEL_INCLUDE_KERNEL_OFFSETS_H_ #define ZEPHYR_KERNEL_INCLUDE_KERNEL_OFFSETS_H_ -#include +#include /* All of this is build time magic, but LCOV gets confused. Disable coverage * for this whole file. diff --git a/kernel/include/offsets_short.h b/kernel/include/offsets_short.h index 13e1afe6dfca84a..373d7e02ec9819c 100644 --- a/kernel/include/offsets_short.h +++ b/kernel/include/offsets_short.h @@ -7,7 +7,7 @@ #ifndef ZEPHYR_KERNEL_INCLUDE_OFFSETS_SHORT_H_ #define ZEPHYR_KERNEL_INCLUDE_OFFSETS_SHORT_H_ -#include +#include #include /* kernel */ diff --git a/kernel/userspace.c b/kernel/userspace.c index ed36bec929ce857..13e3a4d2dde655b 100644 --- a/kernel/userspace.c +++ b/kernel/userspace.c @@ -94,7 +94,7 @@ const char *otype_to_str(enum k_objects otype) case K_OBJ_ANY: ret = "generic"; break; -#include +#include default: ret = "?"; break; @@ -192,7 +192,7 @@ static size_t obj_size_get(enum k_objects otype) size_t ret; switch (otype) { -#include +#include default: ret = sizeof(const struct device); break; diff --git a/lib/libc/minimal/CMakeLists.txt b/lib/libc/minimal/CMakeLists.txt index 71a404e7870926a..836c3706f7c77df 100644 --- a/lib/libc/minimal/CMakeLists.txt +++ b/lib/libc/minimal/CMakeLists.txt @@ -4,7 +4,7 @@ zephyr_system_include_directories(include) zephyr_library() -set(GEN_DIR ${ZEPHYR_BINARY_DIR}/include/generated) +set(GEN_DIR ${ZEPHYR_BINARY_DIR}/include/generated/zephyr) set(STRERROR_TABLE_H ${GEN_DIR}/libc/minimal/strerror_table.h) zephyr_library_cc_option(-fno-builtin) diff --git a/lib/libc/minimal/source/string/strerror.c b/lib/libc/minimal/source/string/strerror.c index 624e8922b7fcf96..f3eb2302b141570 100644 --- a/lib/libc/minimal/source/string/strerror.c +++ b/lib/libc/minimal/source/string/strerror.c @@ -16,7 +16,7 @@ * const char *const sys_errlist[sys_nerr]; * const uint8_t sys_errlen[sys_nerr]; */ -#include "libc/minimal/strerror_table.h" +#include "zephyr/libc/minimal/strerror_table.h" /* * See https://pubs.opengroup.org/onlinepubs/9699919799/functions/strerror.html diff --git a/lib/posix/CMakeLists.txt b/lib/posix/CMakeLists.txt index c6b3a88aeab4a9c..a769367dd640491 100644 --- a/lib/posix/CMakeLists.txt +++ b/lib/posix/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -set(GEN_DIR ${ZEPHYR_BINARY_DIR}/include/generated) +set(GEN_DIR ${ZEPHYR_BINARY_DIR}/include/generated/zephyr) zephyr_syscall_header( ${ZEPHYR_BASE}/include/zephyr/posix/time.h diff --git a/lib/posix/signal.c b/lib/posix/signal.c index d2153238ff8fc57..b72405dbb3a0206 100644 --- a/lib/posix/signal.c +++ b/lib/posix/signal.c @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "posix/strsignal_table.h" +#include "zephyr/posix/strsignal_table.h" #include #include diff --git a/modules/lvgl/lvgl_shell.c b/modules/lvgl/lvgl_shell.c index e8ac27e22f9067e..42d5a5e7a2ac392 100644 --- a/modules/lvgl/lvgl_shell.c +++ b/modules/lvgl/lvgl_shell.c @@ -6,7 +6,7 @@ #include #include -#include +#include #ifdef CONFIG_LV_Z_MEM_POOL_SYS_HEAP #include "lvgl_mem.h" diff --git a/scripts/build/gen_kobject_placeholders.py b/scripts/build/gen_kobject_placeholders.py index 52e2dc2b34c64aa..bdad4e4a38d1982 100755 --- a/scripts/build/gen_kobject_placeholders.py +++ b/scripts/build/gen_kobject_placeholders.py @@ -113,7 +113,7 @@ def parse_args(): parser.add_argument("--object", required=True, help="Points to kobject_prebuilt_hash.c.obj") parser.add_argument("--outdir", required=True, - help="Output directory (/include/generated)") + help="Output directory (/include/generated/zephyr)") parser.add_argument("--datapct", required=True, help="Multiplier to the size of reserved space for DATA region") parser.add_argument("--rodata", required=True, diff --git a/scripts/build/gen_strerror_table.py b/scripts/build/gen_strerror_table.py index 7ec91df32741988..6b4afccbcb43dba 100755 --- a/scripts/build/gen_strerror_table.py +++ b/scripts/build/gen_strerror_table.py @@ -91,7 +91,7 @@ def parse_args(): '--output', dest='output', required=True, - help='output file (e.g. build/zephyr/misc/generated/libc/minimal/strerror_table.h)') + help='output file (e.g. build/zephyr/misc/generated/zephyr/libc/minimal/strerror_table.h)') args = parser.parse_args() diff --git a/scripts/build/gen_strsignal_table.py b/scripts/build/gen_strsignal_table.py index b60b23237dc6399..eb44eb4d456ec1a 100755 --- a/scripts/build/gen_strsignal_table.py +++ b/scripts/build/gen_strsignal_table.py @@ -76,7 +76,7 @@ def parse_args(): '--output', dest='output', required=True, - help='output file (e.g. build/zephyr/misc/generated/lib/posix/strsignal_table.h)') + help='output file (e.g. build/zephyr/misc/generated/zephyr/lib/posix/strsignal_table.h)') args = parser.parse_args() diff --git a/scripts/build/gen_syscalls.py b/scripts/build/gen_syscalls.py index 9ee4e323994173c..5bc076d8a6592a3 100755 --- a/scripts/build/gen_syscalls.py +++ b/scripts/build/gen_syscalls.py @@ -89,7 +89,7 @@ #include -#include +#include #include #include diff --git a/scripts/kconfig/kconfiglib.py b/scripts/kconfig/kconfiglib.py index 75ff3c1ee9ab594..3442b4638a061d0 100644 --- a/scripts/kconfig/kconfiglib.py +++ b/scripts/kconfig/kconfiglib.py @@ -1417,7 +1417,7 @@ def load_allconfig(self, filename): def write_autoconf(self, filename=None, header=None): r""" Writes out symbol values as a C header file, matching the format used - by include/generated/autoconf.h in the kernel. + by include/generated/zephyr/autoconf.h in the kernel. The ordering of the #defines matches the one generated by write_config(). The order in the C implementation depends on the hash @@ -1432,7 +1432,7 @@ def write_autoconf(self, filename=None, header=None): Path to write header to. If None (the default), the path in the environment variable - KCONFIG_AUTOHEADER is used if set, and "include/generated/autoconf.h" + KCONFIG_AUTOHEADER is used if set, and "include/generated/zephyr/autoconf.h" otherwise. This is compatible with the C tools. header (default: None): @@ -1451,7 +1451,7 @@ def write_autoconf(self, filename=None, header=None): """ if filename is None: filename = os.getenv("KCONFIG_AUTOHEADER", - "include/generated/autoconf.h") + "include/generated/zephyr/autoconf.h") if self._write_if_changed(filename, self._autoconf_contents(header)): return "Kconfig header saved to '{}'".format(filename) diff --git a/soc/arm/silabs_exx32/efr32mg24/linker.ld b/soc/arm/silabs_exx32/efr32mg24/linker.ld index 0d44f8636131727..d31a9b6599def98 100644 --- a/soc/arm/silabs_exx32/efr32mg24/linker.ld +++ b/soc/arm/silabs_exx32/efr32mg24/linker.ld @@ -11,6 +11,6 @@ * This is the linker script for both standard images. */ -#include +#include #include diff --git a/soc/riscv/espressif_esp32/esp32c3/soc_irq.S b/soc/riscv/espressif_esp32/esp32c3/soc_irq.S index c1ad164c1536b27..87248dfacca1301 100644 --- a/soc/riscv/espressif_esp32/esp32c3/soc_irq.S +++ b/soc/riscv/espressif_esp32/esp32c3/soc_irq.S @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include /* Exports */ diff --git a/soc/riscv/openisa_rv32m1/soc_irq.S b/soc/riscv/openisa_rv32m1/soc_irq.S index 23222ea2c70941b..b15bc52cbf5c8f6 100644 --- a/soc/riscv/openisa_rv32m1/soc_irq.S +++ b/soc/riscv/openisa_rv32m1/soc_irq.S @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include #include diff --git a/soc/riscv/riscv-ite/common/soc_irq.S b/soc/riscv/riscv-ite/common/soc_irq.S index a412ca6a7966c3f..07cf25f6e260287 100644 --- a/soc/riscv/riscv-ite/common/soc_irq.S +++ b/soc/riscv/riscv-ite/common/soc_irq.S @@ -9,7 +9,7 @@ * privileged architecture specification */ #include -#include +#include #include #include #include diff --git a/soc/riscv/riscv-privileged/andes_v5/soc_irq.S b/soc/riscv/riscv-privileged/andes_v5/soc_irq.S index 459285c12819514..1b1e7562234d591 100644 --- a/soc/riscv/riscv-privileged/andes_v5/soc_irq.S +++ b/soc/riscv/riscv-privileged/andes_v5/soc_irq.S @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include #include diff --git a/soc/riscv/riscv-privileged/common/soc_irq.S b/soc/riscv/riscv-privileged/common/soc_irq.S index 73fc24431d58d26..f80a4910e71c4bd 100644 --- a/soc/riscv/riscv-privileged/common/soc_irq.S +++ b/soc/riscv/riscv-privileged/common/soc_irq.S @@ -9,7 +9,7 @@ * privileged architecture specification */ #include -#include +#include #include #include #include diff --git a/soc/riscv/riscv-privileged/telink_b91/soc_irq.S b/soc/riscv/riscv-privileged/telink_b91/soc_irq.S index ea43de3684bb6a4..76b3ac5a45dc680 100644 --- a/soc/riscv/riscv-privileged/telink_b91/soc_irq.S +++ b/soc/riscv/riscv-privileged/telink_b91/soc_irq.S @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include #include diff --git a/soc/xtensa/espressif_esp32/esp32/gdbstub.c b/soc/xtensa/espressif_esp32/esp32/gdbstub.c index f7962b618513a4b..4b12a73bf407670 100644 --- a/soc/xtensa/espressif_esp32/esp32/gdbstub.c +++ b/soc/xtensa/espressif_esp32/esp32/gdbstub.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include /* * Address Mappings From ESP32 Technical Reference Manual Version 4.5 diff --git a/soc/xtensa/intel_adsp/common/multiprocessing.c b/soc/xtensa/intel_adsp/common/multiprocessing.c index de76fa37eac0cb5..d7b5bb414cd51ca 100644 --- a/soc/xtensa/intel_adsp/common/multiprocessing.c +++ b/soc/xtensa/intel_adsp/common/multiprocessing.c @@ -17,7 +17,7 @@ #include LOG_MODULE_REGISTER(soc_mp, CONFIG_SOC_LOG_LEVEL); -#include +#include #include #include #include diff --git a/subsys/bindesc/bindesc_version.c b/subsys/bindesc/bindesc_version.c index fb7571d3fcb7728..76111ca17bb8c3e 100644 --- a/subsys/bindesc/bindesc_version.c +++ b/subsys/bindesc/bindesc_version.c @@ -34,7 +34,7 @@ BINDESC_UINT_DEFINE(kernel_version_number, BINDESC_ID_KERNEL_VERSION_NUMBER, #endif /* IS_ENABLED(CONFIG_BINDESC_KERNEL_VERSION_NUMBER) */ #if IS_ENABLED(HAS_APP_VERSION) -#include +#include #if IS_ENABLED(CONFIG_BINDESC_APP_VERSION_STRING) BINDESC_STR_DEFINE(app_version_string, BINDESC_ID_APP_VERSION_STRING, diff --git a/subsys/testsuite/ztest/include/zephyr/offsets.h b/subsys/testsuite/ztest/include/zephyr/offsets.h index 7c7c8ee57a6ff7b..d493e837cec43fe 100644 --- a/subsys/testsuite/ztest/include/zephyr/offsets.h +++ b/subsys/testsuite/ztest/include/zephyr/offsets.h @@ -6,7 +6,7 @@ /* * This file is a fake replacement for - * $build_dir/zephyr/include/generated/offsets.h + * $build_dir/zephyr/include/generated/zephyr/offsets.h * * The unittest infrastructure does not know how to generate * offsets.h, so until this is supported we fake it with this diff --git a/tests/boot/mcuboot_data_sharing/CMakeLists.txt b/tests/boot/mcuboot_data_sharing/CMakeLists.txt index 6bdbb43d36bafe4..4b8ae4b81ee44c4 100644 --- a/tests/boot/mcuboot_data_sharing/CMakeLists.txt +++ b/tests/boot/mcuboot_data_sharing/CMakeLists.txt @@ -27,4 +27,8 @@ include(${ZEPHYR_BASE}/cmake/modules/version.cmake) file(READ ${ZEPHYR_BASE}/version.h.in version_content) string(CONFIGURE "${version_content}" version_content) string(CONFIGURE "${version_content}" version_content) -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/zephyr/include/generated/mcuboot_version.h "${version_content}") +file( + WRITE + ${CMAKE_CURRENT_BINARY_DIR}/zephyr/include/generated/zephyr/mcuboot_version.h + "${version_content}" + ) diff --git a/tests/boot/mcuboot_data_sharing/src/main.c b/tests/boot/mcuboot_data_sharing/src/main.c index 1cf3954169b2ee1..b54dd3231a80fdf 100644 --- a/tests/boot/mcuboot_data_sharing/src/main.c +++ b/tests/boot/mcuboot_data_sharing/src/main.c @@ -9,9 +9,9 @@ #include #include #include +#include #include #include -#include #define FLASH_SECTOR_SIZE 1024 #define FLASH_SECTOR_SIZE_KB 4 diff --git a/tests/kernel/threads/dynamic_thread/src/main.c b/tests/kernel/threads/dynamic_thread/src/main.c index 8db6a32c4c5c66c..d8c8c167839a3f1 100644 --- a/tests/kernel/threads/dynamic_thread/src/main.c +++ b/tests/kernel/threads/dynamic_thread/src/main.c @@ -156,7 +156,7 @@ ZTEST(thread_dynamic, test_thread_index_management) switch (K_OBJ_THREAD) { /** @cond keep_doxygen_away */ - #include + #include /** @endcond */ } blob = z_dynamic_object_aligned_create(16, ret);