diff --git a/CMakeLists.txt b/CMakeLists.txt index 19f0f7d20a1..32032afb00e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -402,11 +402,11 @@ set_ifndef( DTS_BOARD_FIXUP_FILE ${BOARD_DIR} set_ifndef( DTS_SOC_FIXUP_FILE ${SOC_DIR}/${ARCH}/${SOC_PATH}/dts_fixup.h) set( DTS_APP_FIXUP_FILE ${APPLICATION_SOURCE_DIR}/dts_fixup.h) -set_ifndef(DTS_CAT_OF_FIXUP_FILES ${ZEPHYR_BINARY_DIR}/include/generated/generated_dts_board_fixups.h) +set_ifndef(DTS_CAT_OF_FIXUP_FILES ${ZEPHYR_BINARY_DIR}/include/generated/devicetree_fixups.h) # Concatenate the fixups into a single header file for easy # #include'ing -file(WRITE ${DTS_CAT_OF_FIXUP_FILES} "/* May only be included by generated_dts_board.h */\n\n") +file(WRITE ${DTS_CAT_OF_FIXUP_FILES} "/* May only be included by devicetree.h */\n\n") foreach(fixup_file ${DTS_BOARD_FIXUP_FILE} ${DTS_SOC_FIXUP_FILE} diff --git a/arch/x86/core/early_serial.c b/arch/x86/core/early_serial.c index 0abad5158de..20da9d53500 100644 --- a/arch/x86/core/early_serial.c +++ b/arch/x86/core/early_serial.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include #include diff --git a/boards/arc/em_starterkit/arc_mpu_regions.c b/boards/arc/em_starterkit/arc_mpu_regions.c index 1a76267e629..ffa970c1198 100644 --- a/boards/arc/em_starterkit/arc_mpu_regions.c +++ b/boards/arc/em_starterkit/arc_mpu_regions.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include #include #include diff --git a/boards/arc/emsdp/arc_mpu_regions.c b/boards/arc/emsdp/arc_mpu_regions.c index a84b2344a96..239a7caa15e 100644 --- a/boards/arc/emsdp/arc_mpu_regions.c +++ b/boards/arc/emsdp/arc_mpu_regions.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include #include #include diff --git a/boards/arc/iotdk/arc_mpu_regions.c b/boards/arc/iotdk/arc_mpu_regions.c index db32d1e6fee..b066f751e0c 100644 --- a/boards/arc/iotdk/arc_mpu_regions.c +++ b/boards/arc/iotdk/arc_mpu_regions.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include #include #include diff --git a/boards/arc/nsim/arc_mpu_regions.c b/boards/arc/nsim/arc_mpu_regions.c index 15e17f8af59..f2ac0304314 100644 --- a/boards/arc/nsim/arc_mpu_regions.c +++ b/boards/arc/nsim/arc_mpu_regions.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include #include #include diff --git a/cmake/dts.cmake b/cmake/dts.cmake index 7814f43e9ed..15a86f9ee49 100644 --- a/cmake/dts.cmake +++ b/cmake/dts.cmake @@ -3,18 +3,17 @@ file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include/generated) # Zephyr code can configure itself based on a KConfig'uration with the -# header file autoconf.h. There exists an analogous file -# generated_dts_board_unfixed.h that allows configuration based on information -# encoded in DTS. +# header file autoconf.h. There exists an analogous file devicetree_unfixed.h +# that allows configuration based on information encoded in DTS. # # Here we call on dtc, the gcc preprocessor, and # scripts/dts/gen_defines.py to generate this header file at # CMake configure-time. # # See ~/zephyr/doc/dts -set(GENERATED_DTS_BOARD_UNFIXED_H ${PROJECT_BINARY_DIR}/include/generated/generated_dts_board_unfixed.h) -set(GENERATED_DTS_BOARD_CONF ${PROJECT_BINARY_DIR}/include/generated/generated_dts_board.conf) -set(DTS_POST_CPP ${PROJECT_BINARY_DIR}/${BOARD}.dts.pre.tmp) +set(DEVICETREE_UNFIXED_H ${PROJECT_BINARY_DIR}/include/generated/devicetree_unfixed.h) +set(DEVICETREE_CONF ${PROJECT_BINARY_DIR}/include/generated/devicetree.conf) +set(DTS_POST_CPP ${PROJECT_BINARY_DIR}/${BOARD}.dts.pre.tmp) set_ifndef(DTS_SOURCE ${BOARD_DIR}/${BOARD}.dts) @@ -111,7 +110,7 @@ if(SUPPORTS_DTS) "DT bindings root directories") # TODO: Cut down on CMake configuration time by avoiding - # regeneration of generated_dts_board_unfixed.h on every configure. How + # regeneration of devicetree_unfixed.h on every configure. How # challenging is this? What are the dts dependencies? We run the # preprocessor, and it seems to be including all kinds of # directories with who-knows how many header files. @@ -195,8 +194,8 @@ if(SUPPORTS_DTS) set(CMD_NEW_EXTRACT ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/dts/gen_defines.py --dts ${BOARD}.dts.pre.tmp --bindings-dirs ${DTS_ROOT_BINDINGS} - --conf-out ${GENERATED_DTS_BOARD_CONF} - --header-out ${GENERATED_DTS_BOARD_UNFIXED_H} + --conf-out ${DEVICETREE_CONF} + --header-out ${DEVICETREE_UNFIXED_H} ) execute_process( @@ -209,5 +208,5 @@ if(SUPPORTS_DTS) endif() else() - file(WRITE ${GENERATED_DTS_BOARD_UNFIXED_H} "/* WARNING. THIS FILE IS AUTO-GENERATED. DO NOT MODIFY! */") + file(WRITE ${DEVICETREE_UNFIXED_H} "/* WARNING. THIS FILE IS AUTO-GENERATED. DO NOT MODIFY! */") endif(SUPPORTS_DTS) diff --git a/cmake/kconfig.cmake b/cmake/kconfig.cmake index 5ca29c5e9e3..7731ada3a40 100644 --- a/cmake/kconfig.cmake +++ b/cmake/kconfig.cmake @@ -45,7 +45,7 @@ set(ENV{SOC_DIR} ${SOC_DIR}) set(ENV{SHIELD_AS_LIST} "${SHIELD_AS_LIST}") set(ENV{CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}) set(ENV{ARCH_DIR} ${ARCH_DIR}) -set(ENV{GENERATED_DTS_BOARD_CONF} ${GENERATED_DTS_BOARD_CONF}) +set(ENV{DEVICETREE_CONF} ${DEVICETREE_CONF}) set(ENV{DTS_POST_CPP} ${DTS_POST_CPP}) set(ENV{DTS_ROOT_BINDINGS} "${DTS_ROOT_BINDINGS}") @@ -91,7 +91,7 @@ foreach(kconfig_target CMAKE_BINARY_DIR=$ENV{CMAKE_BINARY_DIR} ZEPHYR_TOOLCHAIN_VARIANT=${ZEPHYR_TOOLCHAIN_VARIANT} ARCH_DIR=$ENV{ARCH_DIR} - GENERATED_DTS_BOARD_CONF=${GENERATED_DTS_BOARD_CONF} + DEVICETREE_CONF=${DEVICETREE_CONF} DTS_POST_CPP=${DTS_POST_CPP} DTS_ROOT_BINDINGS=${DTS_ROOT_BINDINGS} ${PYTHON_EXECUTABLE} diff --git a/doc/guides/build/build-config-phase.svg b/doc/guides/build/build-config-phase.svg index 7a16da800ff..b521e50abb5 100644 --- a/doc/guides/build/build-config-phase.svg +++ b/doc/guides/build/build-config-phase.svg @@ -1,3 +1,3 @@ -
GNU cpp
[Not supported by viewer]
dtc
[Not supported by viewer]
scripts/dts
(DT postprocessing)
[Not supported by viewer]
parse configuration
(scripts/kconfig)
[Not supported by viewer]

*.dts/dtsi (from board/soc/app/dts)

[Not supported by viewer]

*.yaml in
dts/bindings/

[Not supported by viewer]

Kconfig
(various, scattered)

[Not supported by viewer]
*.dts.pre.tmp
[Not supported by viewer]

generated_dts_board_unfixed.h

[Not supported by viewer]
autoconf.h
[Not supported by viewer]
merge fixups
[Not supported by viewer]

dts_fixup.h (from board/SoC/app)

[Not supported by viewer]
generated_dts_board_fixups.h
[Not supported by viewer]

CMakeLists.txt
(various)

[Not supported by viewer]

Makefile
(various)

[Not supported by viewer]

Configuration Phase (cmake)

[Not supported by viewer] \ No newline at end of file +
GNU cpp
GNU cpp
dtc
dtc
scripts/dts/
(DT postprocessing)
scripts/dts/...
parse configuration
(scripts/kconfig)
parse configuration...

*.dts/dtsi (from board/soc/app/dts)

*.dts/dtsi (from board...

*.yaml in
dts/bindings/

*.yaml in...

Kconfig
(various, scattered)

Kconfig...
*.dts.pre.tmp
*.dts.pre.tmp

devicetree.h

devicetree.h...
autoconf.h
autoconf.h
merge fixups
merge fixups

dts_fixup.h (from board/SoC/app)

dts_fixup.h (from board/S...
devicetree_fixups.h
devicetree_fixups.h

CMakeLists.txt
(various)

CMakeLists.txt...

Makefile
(various)

Makefile...

Configuration Phase (cmake)

Configuration Phase (cmake) \ No newline at end of file diff --git a/doc/guides/dts/index.rst b/doc/guides/dts/index.rst index 6bf78f1e6c4..f3a1d71cdc0 100644 --- a/doc/guides/dts/index.rst +++ b/doc/guides/dts/index.rst @@ -250,7 +250,7 @@ Note that the source code has extensive comments and documentation. devicetree and bindings. The output from :file:`gen_defines.py` is stored in -:file:`include/generated/generated_dts_board_unfixed.h` in the build directory. +:file:`include/generated/devicetree_unfixed.h` in the build directory. .. note:: @@ -259,26 +259,25 @@ The output from :file:`gen_defines.py` is stored in generates. The output is unused. Most devices currently use :file:`dts_fixup.h` files that rename macros from -:file:`generated_dts_board_unfixed.h` to names that are more meaningful for the +:file:`devicetree_unfixed.h` to names that are more meaningful for the device. By default, these fixup files are in the :file:`board/` and :file:`soc/` directories. Any :file:`dts_fixup.h` files are concatenated and -stored as :file:`include/generated_dts_board_fixups.h` in the build directory. +stored as :file:`include/devicetree_fixups.h` in the build directory. Fixup files exist for historical reasons, and Zephyr might move away from using them. When writing new code, feel free to create any macro aliases you need in whatever way is handiest for the code. To reference macros generated from devicetree, code should include the -:file:`generated_dts_board.h` header, which appears on the C preprocessor -include path. This file appears at :zephyr_file:`include/generated_dts_board.h` -and is not a generated file. It includes the generated -:file:`include/generated_dts_board_unfixed.h` and -:file:`include/generated_dts_board_fixups.h` files. +:file:`devicetree.h` header, which appears on the C preprocessor include path. +This file appears at :zephyr_file:`include/devicetree.h` and is not a generated +file. It includes the generated :file:`include/devicetree_unfixed.h` and +:file:`include/devicetree_fixups.h` files. .. warning:: Do not include the generated C headers from the build directory directly. - Include ``generated_dts_board.h`` instead. + Include :file:`devicetree.h` instead. Generated macros ================ @@ -295,7 +294,7 @@ Take the DTS node below as an example. }; Below is sample header content generated for this node, in -:file:`include/generated_dts_board_unfixed.h` in the build directory. +:file:`include/devicetree_unfixed.h` in the build directory. .. code-block:: c @@ -367,10 +366,10 @@ Aliases that replace the property name part can also be generated, e.g. via :zephyr_file:`gen_defines.py `, and check the output generated for some existing boards and applications. -Zephyr device drivers typically use information from ``generated_dts_board.h`` -to statically allocate and initialize :ref:`struct device ` -instances. Property values from ``generated_dts_board.h`` are usually stored in -ROM in the value pointed to by a ``device->config->config_info`` field. For +Zephyr device drivers typically use information from :file:`devicetree.h` to +statically allocate and initialize :ref:`struct device ` +instances. Property values from :file:`devicetree.h` are usually stored in ROM +in the value pointed to by a ``device->config->config_info`` field. For example, a ``struct device`` corresponding to an I2C peripheral would store the peripheral address in its ``reg`` property there. diff --git a/doc/guides/dts/zephyr_dt_inputs_outputs.png b/doc/guides/dts/zephyr_dt_inputs_outputs.png index 8baddb95075..c6636cf3623 100644 Binary files a/doc/guides/dts/zephyr_dt_inputs_outputs.png and b/doc/guides/dts/zephyr_dt_inputs_outputs.png differ diff --git a/doc/guides/dts/zephyr_dt_inputs_outputs.svg b/doc/guides/dts/zephyr_dt_inputs_outputs.svg index 057909d652b..c4687116055 100644 --- a/doc/guides/dts/zephyr_dt_inputs_outputs.svg +++ b/doc/guides/dts/zephyr_dt_inputs_outputs.svg @@ -1,880 +1,3 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - FILE1.overlay - ... - FILE_n.overlay - - - - - - FILE_1.overlay - ... - FILE_n.overlay - - - - - - - - - - - Set by DTC_OVERLAY_FILE. - Optional DTS format files - which override BOARD.dts - - - - - - Set by DTC_OVERLAY_FILE. - Optional DTS format files - which override BOARD.dts. - - - - - - - - - - - In board directory. -The "base" devicetree.Includes .dtsi files. - - - - - - In board directory. - The "base" devicetree. - Includes .dtsi files. - - - - - - - - - - - dtc - - - - Apply - overlays - - - - - - - - - - - BOARD.dts - - - BOARD.dts - - - - - - - - - - - - - BINDING_1.yaml - ... - BINDING_n.yaml - - - - - - BINDING_1.yaml - ... - BINDING_n.yaml - - - - - - - - - - - In zephyr/dts/bindings. - Extensible with DTS_ROOT. - Contain rules for DTS to C - code generation step. - - - - - - In zephyr/dts/bindings/. - Extensible with DTS_ROOT. - Contain rules for DTS to C - code generation step. - - - - - - - - - - - - zephyr DTS - scripts - - - - - - Apply bindings, - generate code - - - - - - - - - - - - BOARD.dts.pre.tmp - - - - - - BOARD.dts.pre.tmp - - - - - - - - - - - In build/zephyr. - DTS file, combination of BOARD.dts and overlays. - Intermediate output. - - - - - - - - - - - - - - - - - Final outputs. - - In build/zephyr/include/generated. - - - - Include C headers via - <generated_dts_board.h> - - - - - - Final outputs, in - build/zephyr/include/generated/. - - - - - - - - - - - - - - generated_dts_board.conf, - generated C headers. - - - - - - Generated C code - (generated_dts_board_<foo>.h) - Include via <generated_dts_board.h> - only, as _<foo> names may change. - - - - - - - - - - In zephyr/dts/bindings. - Extensible with DTS_ROOT. - Contain rules for DTS to C - code generation step. - - - - - - DTS file in build/zephyr/. - Intermediate output, - combination of base - devicetree and any - overlays. - - - - + + +
FILE1.overlay
...
FILE_n.overlay
FILE1.overlay...
Set by DTC_OVERLAY_FILE.
Optional DTS format files
which override BOARD.dts
Set...
In board directory.
The "base" devicetree.
Includes .dtsi files.
In...
dtc
dtc
BOARD.dts
BOARD.dts
BINDING_1.yaml
...
BINDING_n.yaml
BINDING_1.yaml...
In zephyr/dts/bindings.
Extensible with DTS_ROOT.
Contain rules for DTS to C
code generation step.
In z...
zephyr DTS
scripts
zephyr DTS...
BOARD.dts_compiled
BOARD.dts_compiled
In build/zephyr.
DTS file, combination of BOARD.dts and overlays.
Intermediate output.
In build/zephyr....
Final outputs
in build/zephyr/include/generated/

Include C headers via <devicetree.h>
Fina...
devicetree.conf,
generated C headers.
devicetree.conf,... \ No newline at end of file diff --git a/include/arch/arc/arch.h b/include/arch/arc/arch.h index e85708eea78..f3d252e8d3e 100644 --- a/include/arch/arc/arch.h +++ b/include/arch/arc/arch.h @@ -16,7 +16,7 @@ #ifndef ZEPHYR_INCLUDE_ARCH_ARC_ARCH_H_ #define ZEPHYR_INCLUDE_ARCH_ARC_ARCH_H_ -#include +#include #include #include #ifdef CONFIG_CPU_ARCV2 diff --git a/include/arch/arm/aarch32/arch.h b/include/arch/arm/aarch32/arch.h index c11f2b4d70e..c008b06ab9e 100644 --- a/include/arch/arm/aarch32/arch.h +++ b/include/arch/arm/aarch32/arch.h @@ -17,7 +17,7 @@ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_H_ /* Add include for DTS generated information */ -#include +#include /* ARM GPRs are often designated by two different names */ #define sys_define_gpr_with_alias(name1, name2) union { u32_t name1, name2; } diff --git a/include/arch/arm/aarch32/cortex_m/scripts/linker.ld b/include/arch/arm/aarch32/cortex_m/scripts/linker.ld index ae7baade4a9..aed5bee1e20 100644 --- a/include/arch/arm/aarch32/cortex_m/scripts/linker.ld +++ b/include/arch/arm/aarch32/cortex_m/scripts/linker.ld @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/include/arch/arm/aarch32/cortex_r/scripts/linker.ld b/include/arch/arm/aarch32/cortex_r/scripts/linker.ld index a4c683406fa..8b7bf477db0 100644 --- a/include/arch/arm/aarch32/cortex_r/scripts/linker.ld +++ b/include/arch/arm/aarch32/cortex_r/scripts/linker.ld @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/include/arch/nios2/arch.h b/include/arch/nios2/arch.h index 55d4939343e..b4fce379f92 100644 --- a/include/arch/nios2/arch.h +++ b/include/arch/nios2/arch.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/arch/posix/arch.h b/include/arch/posix/arch.h index bb62b95d190..aa11ddf6129 100644 --- a/include/arch/posix/arch.h +++ b/include/arch/posix/arch.h @@ -18,7 +18,7 @@ #define ZEPHYR_INCLUDE_ARCH_POSIX_ARCH_H_ /* Add include for DTS generated information */ -#include +#include #include #include diff --git a/include/arch/riscv/arch.h b/include/arch/riscv/arch.h index 61cde690fc3..7dcd89590ed 100644 --- a/include/arch/riscv/arch.h +++ b/include/arch/riscv/arch.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include /* stacks, for RISCV architecture stack should be 16byte-aligned */ #define STACK_ALIGN 16 diff --git a/include/arch/x86/arch.h b/include/arch/x86/arch.h index 7d4e6d5cc9f..d7309f35965 100644 --- a/include/arch/x86/arch.h +++ b/include/arch/x86/arch.h @@ -6,7 +6,7 @@ #ifndef ZEPHYR_INCLUDE_ARCH_X86_ARCH_H_ #define ZEPHYR_INCLUDE_ARCH_X86_ARCH_H_ -#include +#include /* Changing this value will require manual changes to exception and IDT setup * in locore.S for intel64 diff --git a/include/arch/xtensa/arch.h b/include/arch/xtensa/arch.h index 647c217fd77..928a68a32c2 100644 --- a/include/arch/xtensa/arch.h +++ b/include/arch/xtensa/arch.h @@ -15,7 +15,7 @@ #include -#include +#include #if !defined(_ASMLANGUAGE) && !defined(__ASSEMBLER__) #include #include diff --git a/include/devicetree.h b/include/devicetree.h new file mode 100644 index 00000000000..4c7ee3450ab --- /dev/null +++ b/include/devicetree.h @@ -0,0 +1,14 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * Copyright (c) 2020 Nordic Semiconductor + * + * Not a generated file. Feel free to modify. + */ + +#ifndef DEVICETREE_H +#define DEVICETREE_H + +#include +#include + +#endif /* DEVICETREE_H */ diff --git a/samples/application_development/code_relocation/linker_arm_sram2.ld b/samples/application_development/code_relocation/linker_arm_sram2.ld index 6e3d3b3ff75..9003abab107 100644 --- a/samples/application_development/code_relocation/linker_arm_sram2.ld +++ b/samples/application_development/code_relocation/linker_arm_sram2.ld @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/scripts/kconfig/kconfigfunctions.py b/scripts/kconfig/kconfigfunctions.py index ec51ec5d22f..c0b0316f4ec 100644 --- a/scripts/kconfig/kconfigfunctions.py +++ b/scripts/kconfig/kconfigfunctions.py @@ -1,4 +1,3 @@ -# # Copyright (c) 2018-2019 Linaro # Copyright (c) 2019 Nordic Semiconductor ASA # @@ -28,11 +27,10 @@ if not doc_mode: else: edt = None - # The env var 'GENERATED_DTS_BOARD_CONF' must be set unless we are in - # doc mode - GENERATED_DTS_BOARD_CONF = os.environ['GENERATED_DTS_BOARD_CONF'] - if os.path.isfile(GENERATED_DTS_BOARD_CONF): - with open(GENERATED_DTS_BOARD_CONF, 'r', encoding='utf-8') as fd: + # The env. var DEVICETREE_CONF must be set unless we are in doc mode + DEVICETREE_CONF = os.environ['DEVICETREE_CONF'] + if os.path.isfile(DEVICETREE_CONF): + with open(DEVICETREE_CONF, 'r', encoding='utf-8') as fd: for line in fd: if '=' in line: define, val = line.split('=', 1) @@ -56,9 +54,9 @@ def _dt_units_to_scale(unit): def dt_int_val(kconf, _, name, unit=None): """ This function looks up 'name' in the DTS generated "conf" style database - (generated_dts_board.conf in /zephyr/include/generated/) - and if it's found it will return the value as an decimal integer. The - function will divide the value based on 'unit': + (devicetree.conf in /zephyr/include/generated/) and if it's + found it will return the value as an decimal integer. The function will + divide the value based on 'unit': None No division 'k' or 'K' divide by 1024 (1 << 10) 'm' or 'M' divide by 1,048,576 (1 << 20) @@ -81,9 +79,9 @@ def dt_int_val(kconf, _, name, unit=None): def dt_hex_val(kconf, _, name, unit=None): """ This function looks up 'name' in the DTS generated "conf" style database - (generated_dts_board.conf in /zephyr/include/generated/) - and if it's found it will return the value as an hex integer. The - function will divide the value based on 'unit': + (devicetree.conf in /zephyr/include/generated/) and if it's + found it will return the value as an hex integer. The function will divide + the value based on 'unit': None No division 'k' or 'K' divide by 1024 (1 << 10) 'm' or 'M' divide by 1,048,576 (1 << 20) @@ -106,9 +104,9 @@ def dt_hex_val(kconf, _, name, unit=None): def dt_str_val(kconf, _, name): """ This function looks up 'name' in the DTS generated "conf" style database - (generated_dts_board.conf in /zephyr/include/generated/) - and if it's found it will return the value as string. If it's not found we - return an empty string. + (devicetree.conf in /zephyr/include/generated/) and if it's + found it will return the value as string. If it's not found we return an + empty string. """ if doc_mode or name not in dt_defines: return "" diff --git a/soc/arc/snps_arc_hsdk/linker.ld b/soc/arc/snps_arc_hsdk/linker.ld index 90e9bd002c8..f7f2c9dec51 100644 --- a/soc/arc/snps_arc_hsdk/linker.ld +++ b/soc/arc/snps_arc_hsdk/linker.ld @@ -8,7 +8,7 @@ * @brief Linker script for the HS Development Kit */ -#include +#include #include /* diff --git a/soc/arc/snps_arc_iot/linker.ld b/soc/arc/snps_arc_iot/linker.ld index 449c68b4f1d..9c50108af45 100644 --- a/soc/arc/snps_arc_iot/linker.ld +++ b/soc/arc/snps_arc_iot/linker.ld @@ -8,7 +8,7 @@ * @brief Linker script for the Synopsys ARC IoT Development Kit */ -#include +#include #include /* diff --git a/soc/arc/snps_emsdp/linker.ld b/soc/arc/snps_emsdp/linker.ld index 022fb9931f8..159a63551c2 100644 --- a/soc/arc/snps_emsdp/linker.ld +++ b/soc/arc/snps_emsdp/linker.ld @@ -8,7 +8,7 @@ * @brief Linker script for the Synopsys ARC IoT Development Kit */ -#include +#include #include /* diff --git a/soc/arc/snps_emsk/linker.ld b/soc/arc/snps_emsk/linker.ld index f06f37536d0..3b77c99663e 100644 --- a/soc/arc/snps_emsk/linker.ld +++ b/soc/arc/snps_emsk/linker.ld @@ -8,7 +8,7 @@ * @brief Linker script for the Synopsys EM Starterkit platform. */ -#include +#include #include /* diff --git a/soc/arc/snps_nsim/linker.ld b/soc/arc/snps_nsim/linker.ld index 947b816e00d..c20cc9bb74c 100644 --- a/soc/arc/snps_nsim/linker.ld +++ b/soc/arc/snps_nsim/linker.ld @@ -8,7 +8,7 @@ * @brief Linker script for the Synopsys EM Starterkit platform. */ -#include +#include #include /* Instruction Closely Coupled Memory (ICCM) base address and size */ diff --git a/soc/arm/arm/beetle/soc.h b/soc/arm/arm/beetle/soc.h index 42f7477bed3..2d86750fa82 100644 --- a/soc/arm/arm/beetle/soc.h +++ b/soc/arm/arm/beetle/soc.h @@ -96,7 +96,7 @@ #ifndef _ASMLANGUAGE /* Add include for DTS generated information */ -#include +#include #include "soc_pins.h" #include "soc_power.h" diff --git a/soc/arm/arm/mps2/soc.h b/soc/arm/arm/mps2/soc.h index 937608b97ea..47cdfa1ead0 100644 --- a/soc/arm/arm/mps2/soc.h +++ b/soc/arm/arm/mps2/soc.h @@ -15,7 +15,7 @@ #define __DSP_PRESENT 1U /* DSP extension present */ #endif -#include +#include #include extern void wakeup_cpu1(void); diff --git a/soc/arm/arm/musca_a/soc.h b/soc/arm/arm/musca_a/soc.h index dca8de41bdd..67159183732 100644 --- a/soc/arm/arm/musca_a/soc.h +++ b/soc/arm/arm/musca_a/soc.h @@ -9,7 +9,7 @@ #ifndef _ASMLANGUAGE #include "system_cmsdk_musca.h" -#include +#include #include #endif diff --git a/soc/arm/arm/musca_b1/soc.h b/soc/arm/arm/musca_b1/soc.h index 80011b92796..8376965a1db 100644 --- a/soc/arm/arm/musca_b1/soc.h +++ b/soc/arm/arm/musca_b1/soc.h @@ -9,7 +9,7 @@ #ifndef _ASMLANGUAGE #include "system_cmsdk_musca_b1.h" -#include +#include #include #endif diff --git a/soc/arm/atmel_sam/sam3x/soc.h b/soc/arm/atmel_sam/sam3x/soc.h index 51ced5dcebc..abc739efc17 100644 --- a/soc/arm/atmel_sam/sam3x/soc.h +++ b/soc/arm/atmel_sam/sam3x/soc.h @@ -36,7 +36,7 @@ #endif /* Add include for DTS generated information */ -#include +#include #define ID_UART0 ID_UART #define UART0 UART diff --git a/soc/arm/atmel_sam/same70/soc.h b/soc/arm/atmel_sam/same70/soc.h index a836394b280..5b2daefffc8 100644 --- a/soc/arm/atmel_sam/same70/soc.h +++ b/soc/arm/atmel_sam/same70/soc.h @@ -67,7 +67,7 @@ #include "../common/soc_gpio.h" /* Add include for DTS generated information */ -#include +#include #endif /* _ASMLANGUAGE */ diff --git a/soc/arm/nordic_nrf/nrf51/soc.h b/soc/arm/nordic_nrf/nrf51/soc.h index 9991e4dc4fe..4f9069096f4 100644 --- a/soc/arm/nordic_nrf/nrf51/soc.h +++ b/soc/arm/nordic_nrf/nrf51/soc.h @@ -16,7 +16,7 @@ #include /* Add include for DTS generated information */ -#include +#include #endif /* !_ASMLANGUAGE */ diff --git a/soc/arm/nordic_nrf/nrf52/soc.h b/soc/arm/nordic_nrf/nrf52/soc.h index 9a6ccf44534..f095d3fafa3 100644 --- a/soc/arm/nordic_nrf/nrf52/soc.h +++ b/soc/arm/nordic_nrf/nrf52/soc.h @@ -16,7 +16,7 @@ #include /* Add include for DTS generated information */ -#include +#include #endif /* !_ASMLANGUAGE */ diff --git a/soc/arm/nordic_nrf/nrf53/soc.h b/soc/arm/nordic_nrf/nrf53/soc.h index d7f3ac5a31f..4a1c602e3aa 100644 --- a/soc/arm/nordic_nrf/nrf53/soc.h +++ b/soc/arm/nordic_nrf/nrf53/soc.h @@ -17,7 +17,7 @@ #include /* Add include for DTS generated information */ -#include +#include #endif /* !_ASMLANGUAGE */ diff --git a/soc/arm/nordic_nrf/nrf91/soc.h b/soc/arm/nordic_nrf/nrf91/soc.h index 592890ac394..2c88ae6b955 100644 --- a/soc/arm/nordic_nrf/nrf91/soc.h +++ b/soc/arm/nordic_nrf/nrf91/soc.h @@ -16,7 +16,7 @@ #include /* Add include for DTS generated information */ -#include +#include #endif /* !_ASMLANGUAGE */ diff --git a/soc/arm/nxp_imx/rt/linker.ld b/soc/arm/nxp_imx/rt/linker.ld index 01e4e28df4f..1f0457de93a 100644 --- a/soc/arm/nxp_imx/rt/linker.ld +++ b/soc/arm/nxp_imx/rt/linker.ld @@ -5,7 +5,7 @@ */ #include - #include + #include MEMORY { diff --git a/soc/arm/nxp_imx/rt/soc.h b/soc/arm/nxp_imx/rt/soc.h index 27c7c69e84d..e25b8722a8c 100644 --- a/soc/arm/nxp_imx/rt/soc.h +++ b/soc/arm/nxp_imx/rt/soc.h @@ -14,7 +14,7 @@ #include /* Add include for DTS generated information */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/soc/arm/nxp_kinetis/k6x/soc.h b/soc/arm/nxp_kinetis/k6x/soc.h index a3470991991..7d93f034c39 100644 --- a/soc/arm/nxp_kinetis/k6x/soc.h +++ b/soc/arm/nxp_kinetis/k6x/soc.h @@ -32,7 +32,7 @@ #include /* Add include for DTS generated information */ -#include +#include #endif /* !_ASMLANGUAGE */ diff --git a/soc/arm/nxp_kinetis/k8x/soc.h b/soc/arm/nxp_kinetis/k8x/soc.h index 1dc9ba8d0f7..518d6676ce0 100644 --- a/soc/arm/nxp_kinetis/k8x/soc.h +++ b/soc/arm/nxp_kinetis/k8x/soc.h @@ -18,7 +18,7 @@ extern "C" { #include /* Add include for DTS generated information */ -#include +#include #endif /* !_ASMLANGUAGE */ diff --git a/soc/arm/nxp_kinetis/ke1xf/soc.h b/soc/arm/nxp_kinetis/ke1xf/soc.h index 849ae086389..adb185cc526 100644 --- a/soc/arm/nxp_kinetis/ke1xf/soc.h +++ b/soc/arm/nxp_kinetis/ke1xf/soc.h @@ -14,7 +14,7 @@ #include /* Add include for DTS generated information */ -#include +#include #endif /* !_ASMLANGUAGE */ diff --git a/soc/arm/nxp_kinetis/kl2x/soc.h b/soc/arm/nxp_kinetis/kl2x/soc.h index 3295c3d4a8a..569c9014c2e 100644 --- a/soc/arm/nxp_kinetis/kl2x/soc.h +++ b/soc/arm/nxp_kinetis/kl2x/soc.h @@ -16,7 +16,7 @@ #include /* Add include for DTS generated information */ -#include +#include #endif /* !_ASMLANGUAGE */ diff --git a/soc/arm/nxp_kinetis/kv5x/soc.h b/soc/arm/nxp_kinetis/kv5x/soc.h index 1dc9ba8d0f7..518d6676ce0 100644 --- a/soc/arm/nxp_kinetis/kv5x/soc.h +++ b/soc/arm/nxp_kinetis/kv5x/soc.h @@ -18,7 +18,7 @@ extern "C" { #include /* Add include for DTS generated information */ -#include +#include #endif /* !_ASMLANGUAGE */ diff --git a/soc/arm/nxp_kinetis/kwx/soc.h b/soc/arm/nxp_kinetis/kwx/soc.h index 1259349075d..959fcaee78a 100644 --- a/soc/arm/nxp_kinetis/kwx/soc.h +++ b/soc/arm/nxp_kinetis/kwx/soc.h @@ -27,7 +27,7 @@ #include /* Add include for DTS generated information */ -#include +#include #endif /* !_ASMLANGUAGE */ diff --git a/soc/arm/nxp_lpc/lpc54xxx/soc.h b/soc/arm/nxp_lpc/lpc54xxx/soc.h index 8484cb0ec7d..492cefac919 100644 --- a/soc/arm/nxp_lpc/lpc54xxx/soc.h +++ b/soc/arm/nxp_lpc/lpc54xxx/soc.h @@ -20,7 +20,7 @@ #include /* Add include for DTS generated information */ -#include +#include #endif /* !_ASMLANGUAGE */ diff --git a/soc/arm/nxp_lpc/lpc55xxx/soc.h b/soc/arm/nxp_lpc/lpc55xxx/soc.h index c4d4ec2d043..e2b6c95efeb 100644 --- a/soc/arm/nxp_lpc/lpc55xxx/soc.h +++ b/soc/arm/nxp_lpc/lpc55xxx/soc.h @@ -20,7 +20,7 @@ #include /* Add include for DTS generated information */ -#include +#include #endif /* !_ASMLANGUAGE */ diff --git a/soc/arm/silabs_exx32/efr32mg12p/soc.h b/soc/arm/silabs_exx32/efr32mg12p/soc.h index efc0d1a1bb5..13d28492499 100644 --- a/soc/arm/silabs_exx32/efr32mg12p/soc.h +++ b/soc/arm/silabs_exx32/efr32mg12p/soc.h @@ -20,7 +20,7 @@ #include /* Add include for DTS generated information */ -#include +#include #include "soc_pinmap.h" #include "../common/soc_gpio.h" diff --git a/soc/arm/st_stm32/stm32f4/soc.h b/soc/arm/st_stm32/stm32f4/soc.h index ca56b692f09..949c4f83d18 100644 --- a/soc/arm/st_stm32/stm32f4/soc.h +++ b/soc/arm/st_stm32/stm32f4/soc.h @@ -25,7 +25,7 @@ #include /* Add include for DTS generated information */ -#include +#include #ifdef CONFIG_EXTI_STM32 #include diff --git a/soc/arm/st_stm32/stm32f7/soc.h b/soc/arm/st_stm32/stm32f7/soc.h index 5f9a9d85c1c..d04704d52ee 100644 --- a/soc/arm/st_stm32/stm32f7/soc.h +++ b/soc/arm/st_stm32/stm32f7/soc.h @@ -24,7 +24,7 @@ #include /* Add include for DTS generated information */ -#include +#include #ifdef CONFIG_EXTI_STM32 #include diff --git a/soc/arm/st_stm32/stm32g0/soc.h b/soc/arm/st_stm32/stm32g0/soc.h index b49921ac341..3b12f87bfdb 100644 --- a/soc/arm/st_stm32/stm32g0/soc.h +++ b/soc/arm/st_stm32/stm32g0/soc.h @@ -53,7 +53,7 @@ #endif /* Add include for DTS generated information */ -#include +#include #endif /* !_ASMLANGUAGE */ diff --git a/soc/arm/st_stm32/stm32g4/soc.h b/soc/arm/st_stm32/stm32g4/soc.h index eda3d015f74..e4279204e9e 100644 --- a/soc/arm/st_stm32/stm32g4/soc.h +++ b/soc/arm/st_stm32/stm32g4/soc.h @@ -25,7 +25,7 @@ #include /* Add include for DTS generated information */ -#include +#include #ifdef CONFIG_CLOCK_CONTROL_STM32_CUBE #include diff --git a/soc/arm/st_stm32/stm32l4/soc.h b/soc/arm/st_stm32/stm32l4/soc.h index d067ee19d9d..3b58bd13327 100644 --- a/soc/arm/st_stm32/stm32l4/soc.h +++ b/soc/arm/st_stm32/stm32l4/soc.h @@ -27,7 +27,7 @@ #include /* Add include for DTS generated information */ -#include +#include #ifdef CONFIG_EXTI_STM32 #include diff --git a/soc/arm/st_stm32/stm32wb/soc.h b/soc/arm/st_stm32/stm32wb/soc.h index fdc21aada01..6441ef42d25 100644 --- a/soc/arm/st_stm32/stm32wb/soc.h +++ b/soc/arm/st_stm32/stm32wb/soc.h @@ -24,7 +24,7 @@ #include /* Add include for DTS generated information */ -#include +#include #ifdef CONFIG_GPIO_STM32 #include diff --git a/soc/nios2/nios2-qemu/linker.ld b/soc/nios2/nios2-qemu/linker.ld index 31b9b0621a9..7f2b5015dc5 100644 --- a/soc/nios2/nios2-qemu/linker.ld +++ b/soc/nios2/nios2-qemu/linker.ld @@ -9,5 +9,5 @@ */ #include -#include +#include #include diff --git a/soc/nios2/nios2f-zephyr/linker.ld b/soc/nios2/nios2f-zephyr/linker.ld index 31b9b0621a9..7f2b5015dc5 100644 --- a/soc/nios2/nios2f-zephyr/linker.ld +++ b/soc/nios2/nios2f-zephyr/linker.ld @@ -9,5 +9,5 @@ */ #include -#include +#include #include diff --git a/soc/riscv/litex-vexriscv/soc.h b/soc/riscv/litex-vexriscv/soc.h index 49a71faf79d..5485175f94a 100644 --- a/soc/riscv/litex-vexriscv/soc.h +++ b/soc/riscv/litex-vexriscv/soc.h @@ -8,7 +8,7 @@ #define __RISCV32_LITEX_VEXRISCV_SOC_H_ #include "../riscv-privilege/common/soc_common.h" -#include +#include /* lib-c hooks required RAM defined variables */ #define RISCV_RAM_BASE DT_INST_0_MMIO_SRAM_BASE_ADDRESS diff --git a/soc/riscv/openisa_rv32m1/linker.ld b/soc/riscv/openisa_rv32m1/linker.ld index ae8269b1f5a..b42522d0aa3 100644 --- a/soc/riscv/openisa_rv32m1/linker.ld +++ b/soc/riscv/openisa_rv32m1/linker.ld @@ -12,7 +12,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include #include diff --git a/soc/riscv/riscv-privilege/miv/soc.h b/soc/riscv/riscv-privilege/miv/soc.h index c1933a32547..0e2bf67c295 100644 --- a/soc/riscv/riscv-privilege/miv/soc.h +++ b/soc/riscv/riscv-privilege/miv/soc.h @@ -5,7 +5,7 @@ #define __RISCV32_MIV_SOC_H_ #include -#include +#include /* GPIO Interrupts */ #define MIV_GPIO_0_IRQ (0) diff --git a/soc/riscv/riscv-privilege/sifive-freedom/soc.h b/soc/riscv/riscv-privilege/sifive-freedom/soc.h index de037f1f644..9d84a668a17 100644 --- a/soc/riscv/riscv-privilege/sifive-freedom/soc.h +++ b/soc/riscv/riscv-privilege/sifive-freedom/soc.h @@ -12,7 +12,7 @@ #define __RISCV_SIFIVE_FREEDOM_SOC_H_ #include -#include +#include /* PINMUX Configuration */ #define SIFIVE_PINMUX_0_BASE_ADDR (DT_INST_0_SIFIVE_GPIO0_BASE_ADDRESS + 0x38) diff --git a/soc/x86/apollo_lake/linker.ld b/soc/x86/apollo_lake/linker.ld index 1d1c2ae414c..b90f93220b3 100644 --- a/soc/x86/apollo_lake/linker.ld +++ b/soc/x86/apollo_lake/linker.ld @@ -6,7 +6,7 @@ */ #include -#include +#include #define PHYS_LOAD_ADDR DT_PHYS_RAM_ADDR #define PHYS_RAM_ADDR DT_PHYS_RAM_ADDR diff --git a/soc/x86/atom/linker.ld b/soc/x86/atom/linker.ld index 75064e72205..55adc55bbbe 100644 --- a/soc/x86/atom/linker.ld +++ b/soc/x86/atom/linker.ld @@ -12,7 +12,7 @@ */ #include -#include +#include /* physical address where the kernel is loaded */ #define PHYS_LOAD_ADDR DT_PHYS_LOAD_ADDR @@ -42,4 +42,3 @@ MEMORY } #include - diff --git a/soc/x86/ia32/linker.ld b/soc/x86/ia32/linker.ld index 09219e9b40f..6e60f08dce5 100644 --- a/soc/x86/ia32/linker.ld +++ b/soc/x86/ia32/linker.ld @@ -15,7 +15,7 @@ */ #include -#include +#include /* physical address where the kernel is loaded */ /* physical address of RAM */ diff --git a/soc/xtensa/esp32/linker.ld b/soc/xtensa/esp32/linker.ld index 054ed9c20f9..e01fb03e528 100644 --- a/soc/xtensa/esp32/linker.ld +++ b/soc/xtensa/esp32/linker.ld @@ -11,7 +11,7 @@ * Linker script for the Xtensa platform. */ -#include +#include #include #include #include diff --git a/soc/xtensa/intel_s1000/linker.ld b/soc/xtensa/intel_s1000/linker.ld index a2298c8d990..000a053abc1 100644 --- a/soc/xtensa/intel_s1000/linker.ld +++ b/soc/xtensa/intel_s1000/linker.ld @@ -13,7 +13,7 @@ OUTPUT_ARCH(xtensa) -#include +#include #include "memory.h" #include #include diff --git a/soc/xtensa/sample_controller/linker.ld b/soc/xtensa/sample_controller/linker.ld index e040e679687..215c2f7247e 100644 --- a/soc/xtensa/sample_controller/linker.ld +++ b/soc/xtensa/sample_controller/linker.ld @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ll_irqs.h b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ll_irqs.h index e425a468450..75d6534b78f 100644 --- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ll_irqs.h +++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ll_irqs.h @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ /* Needed for the DT_INST_* defines below */ -#include +#include #define LL_SWI4_IRQn EMVSIM0_IRQn #define LL_SWI5_IRQn MUA_IRQn diff --git a/subsys/dfu/img_util/flash_img.c b/subsys/dfu/img_util/flash_img.c index 71e22f26872..9b0d9cf53e1 100644 --- a/subsys/dfu/img_util/flash_img.c +++ b/subsys/dfu/img_util/flash_img.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); #include #endif -#include +#include /* DT_FLASH_AREA_IMAGE_XX_YY values used below are auto-generated by DT */ #ifdef CONFIG_TRUSTED_EXECUTION_NONSECURE #define FLASH_AREA_IMAGE_SECONDARY DT_FLASH_AREA_IMAGE_1_NONSECURE_ID diff --git a/subsys/net/lib/openthread/platform/openthread-core-zephyr-config.h b/subsys/net/lib/openthread/platform/openthread-core-zephyr-config.h index 30b51b8de4b..8a00026be4a 100644 --- a/subsys/net/lib/openthread/platform/openthread-core-zephyr-config.h +++ b/subsys/net/lib/openthread/platform/openthread-core-zephyr-config.h @@ -13,7 +13,7 @@ #ifndef OPENTHREAD_CORE_ZEPHYR_CONFIG_H_ #define OPENTHREAD_CORE_ZEPHYR_CONFIG_H_ -#include +#include /** * @def OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS diff --git a/west.yml b/west.yml index 760eb1236b9..615b69bbda9 100644 --- a/west.yml +++ b/west.yml @@ -29,7 +29,7 @@ manifest: revision: 5690f5b84495c8b657ff204c5c827df1ab9e12e3 path: modules/hal/atmel - name: ci-tools - revision: eb7f1e19eff28d486c64b850ef7b9dcd0331a7af + revision: c7d432c9c3674f5d646cf8f8a56f79a469e4e2a2 path: tools/ci-tools - name: civetweb revision: 99129c5efc907ea613c4b73ccff07581feb58a7a @@ -62,7 +62,7 @@ manifest: revision: 2f1923cb2067bbddb89716896cf27d7c2245f580 path: modules/hal/stm32 - name: hal_ti - revision: 879c7d08ffc6cd18737847030b906cffe3b0a8fb + revision: c9fd9faeaba28c23998a83b37054805259dd8de8 path: modules/hal/ti - name: libmetal revision: 45e630d6152824f807d3f919958605c4626cbdff @@ -74,7 +74,7 @@ manifest: revision: 3776c158fe138a72c97c187e4d31c81c37884be9 path: modules/crypto/mbedtls - name: mcuboot - revision: c2bd757332bfde11c27019f937b0c61d5e9b9fd9 + revision: e96b6873bd8a64185796ac47b941f56dd29b6e3f path: bootloader/mcuboot - name: mcumgr revision: b18b3d16441f40cf983aa034258e8f7c97bfe9bf