dts: Rename generated_dts_board*.{h,conf} to devicetree*.{h,conf}

generated_dts_board.h is pretty redundant and confusing as a name. Call
it devicetree.h instead.

dts.h would be another option, but DTS stands for "devicetree source"
and is the source code format, so it's a bit confusing too.

The replacement was done by grepping for 'generated_dts_board' and
'GENERATED_DTS_BOARD'.

Two build diagram and input-output SVG files were updated as well, along
with misc. documentation.

hal_ti, mcuboot, and ci-tools updates are included too, in the west.yml
update.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>

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}

arch/x86/core/early_serial.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <kernel.h>
 #include <sys/util.h>
 

boards/arc/em_starterkit/arc_mpu_regions.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <soc.h>
 #include <arch/arc/v2/mpu/arc_mpu.h>
 #include <linker/linker-defs.h>

boards/arc/emsdp/arc_mpu_regions.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <soc.h>
 #include <arch/arc/v2/mpu/arc_mpu.h>
 #include <linker/linker-defs.h>

boards/arc/iotdk/arc_mpu_regions.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <soc.h>
 #include <arch/arc/v2/mpu/arc_mpu.h>
 #include <linker/linker-defs.h>

boards/arc/nsim/arc_mpu_regions.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <soc.h>
 #include <arch/arc/v2/mpu/arc_mpu.h>
 #include <linker/linker-defs.h>

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
+# header file autoconf.h. There exists an analogous file devicetree_unfixed.h
-# generated_dts_board_unfixed.h that allows configuration based on information
+# that allows configuration based on information encoded in DTS.
-# 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(DEVICETREE_UNFIXED_H ${PROJECT_BINARY_DIR}/include/generated/devicetree_unfixed.h)
-set(GENERATED_DTS_BOARD_CONF      ${PROJECT_BINARY_DIR}/include/generated/generated_dts_board.conf)
+set(DEVICETREE_CONF      ${PROJECT_BINARY_DIR}/include/generated/devicetree.conf)
-set(DTS_POST_CPP                  ${PROJECT_BINARY_DIR}/${BOARD}.dts.pre.tmp)
+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}
+  --conf-out ${DEVICETREE_CONF}
-  --header-out ${GENERATED_DTS_BOARD_UNFIXED_H}
+  --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)

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}

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
+:file:`devicetree.h` header, which appears on the C preprocessor include path.
-include path. This file appears at :zephyr_file:`include/generated_dts_board.h`
+This file appears at :zephyr_file:`include/devicetree.h` and is not a generated
-and is not a generated file. It includes the generated
+file. It includes the generated :file:`include/devicetree_unfixed.h` and
-:file:`include/generated_dts_board_unfixed.h` and
+:file:`include/devicetree_fixups.h` files.
-:file:`include/generated_dts_board_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 <scripts/dts/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``
+Zephyr device drivers typically use information from :file:`devicetree.h` to
-to statically allocate and initialize :ref:`struct device <device_struct>`
+statically allocate and initialize :ref:`struct device <device_struct>`
-instances. Property values from ``generated_dts_board.h`` are usually stored in
+instances. Property values from :file:`devicetree.h` are usually stored in ROM
-ROM in the value pointed to by a ``device->config->config_info`` field. For
+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.
 

include/arch/arc/arch.h

@@ -16,7 +16,7 @@
 #ifndef ZEPHYR_INCLUDE_ARCH_ARC_ARCH_H_
 #define ZEPHYR_INCLUDE_ARCH_ARC_ARCH_H_
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <sw_isr_table.h>
 #include <arch/arc/thread.h>
 #ifdef CONFIG_CPU_ARCV2

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 <generated_dts_board.h>
+#include <devicetree.h>
 
 /* ARM GPRs are often designated by two different names */
 #define sys_define_gpr_with_alias(name1, name2) union { u32_t name1, name2; }

include/arch/arm/aarch32/cortex_m/scripts/linker.ld

@@ -13,7 +13,7 @@
 
 #include <autoconf.h>
 #include <linker/sections.h>
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #include <linker/linker-defs.h>
 #include <linker/linker-tool.h>

include/arch/arm/aarch32/cortex_r/scripts/linker.ld

@@ -13,7 +13,7 @@
 
 #include <autoconf.h>
 #include <linker/sections.h>
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #include <linker/linker-defs.h>
 #include <linker/linker-tool.h>

include/arch/nios2/arch.h

@@ -19,7 +19,7 @@
 #include <arch/nios2/thread.h>
 #include <arch/nios2/asm_inline.h>
 #include <arch/common/addr_types.h>
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <arch/nios2/nios2.h>
 #include <arch/common/sys_io.h>
 #include <arch/common/ffs.h>

include/arch/posix/arch.h

@@ -18,7 +18,7 @@
 #define ZEPHYR_INCLUDE_ARCH_POSIX_ARCH_H_
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #include <toolchain.h>
 #include <irq.h>

include/arch/riscv/arch.h

@@ -23,7 +23,7 @@
 #include <irq.h>
 #include <sw_isr_table.h>
 #include <soc.h>
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 /* stacks, for RISCV architecture stack should be 16byte-aligned */
 #define STACK_ALIGN  16

include/arch/x86/arch.h

@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_INCLUDE_ARCH_X86_ARCH_H_
 #define ZEPHYR_INCLUDE_ARCH_X86_ARCH_H_
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 /* Changing this value will require manual changes to exception and IDT setup
  * in locore.S for intel64

include/arch/xtensa/arch.h

@@ -15,7 +15,7 @@
 
 #include <irq.h>
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #if !defined(_ASMLANGUAGE) && !defined(__ASSEMBLER__)
 #include <zephyr/types.h>
 #include <arch/common/sys_io.h>

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 <devicetree_unfixed.h>
+#include <devicetree_fixups.h>
+
+#endif /* DEVICETREE_H */

samples/application_development/code_relocation/linker_arm_sram2.ld

@@ -13,7 +13,7 @@
 
 #include <autoconf.h>
 #include <linker/sections.h>
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #include <linker/linker-defs.h>
 #include <linker/linker-tool.h>

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
+    # The env. var DEVICETREE_CONF must be set unless we are in doc mode
-    # doc mode
+    DEVICETREE_CONF = os.environ['DEVICETREE_CONF']
-    GENERATED_DTS_BOARD_CONF = os.environ['GENERATED_DTS_BOARD_CONF']
+    if os.path.isfile(DEVICETREE_CONF):
-    if os.path.isfile(GENERATED_DTS_BOARD_CONF):
+        with open(DEVICETREE_CONF, 'r', encoding='utf-8') as fd:
-        with open(GENERATED_DTS_BOARD_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 <build_dir>/zephyr/include/generated/)
+    (devicetree.conf in <build_dir>/zephyr/include/generated/) and if it's
-    and if it's found it will return the value as an decimal integer.  The
+    found it will return the value as an decimal integer.  The function will
-    function will divide the value based on 'unit':
+    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 <build_dir>/zephyr/include/generated/)
+    (devicetree.conf in <build_dir>/zephyr/include/generated/) and if it's
-    and if it's found it will return the value as an hex integer.  The
+    found it will return the value as an hex integer.  The function will divide
-    function will divide the value based on 'unit':
+    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 <build_dir>/zephyr/include/generated/)
+    (devicetree.conf in <build_dir>/zephyr/include/generated/) and if it's
-    and if it's found it will return the value as string.  If it's not found we
+    found it will return the value as string.  If it's not found we return an
-    return an empty string.
+    empty string.
     """
     if doc_mode or name not in dt_defines:
         return ""

soc/arc/snps_arc_hsdk/linker.ld

@@ -8,7 +8,7 @@
  * @brief Linker script for the HS Development Kit
  */
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <autoconf.h>
 
 /*

soc/arc/snps_arc_iot/linker.ld

@@ -8,7 +8,7 @@
  * @brief Linker script for the Synopsys ARC IoT Development Kit
  */
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <autoconf.h>
 
 /*

soc/arc/snps_emsdp/linker.ld

@@ -8,7 +8,7 @@
  * @brief Linker script for the Synopsys ARC IoT Development Kit
  */
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <autoconf.h>
 
 /*

soc/arc/snps_emsk/linker.ld

@@ -8,7 +8,7 @@
  * @brief Linker script for the Synopsys EM Starterkit platform.
  */
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <autoconf.h>
 
 /*

soc/arc/snps_nsim/linker.ld

@@ -8,7 +8,7 @@
  * @brief Linker script for the Synopsys EM Starterkit platform.
  */
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <autoconf.h>
 
 /* Instruction Closely Coupled Memory (ICCM) base address and size */

soc/arm/arm/beetle/soc.h

@@ -96,7 +96,7 @@
 #ifndef _ASMLANGUAGE
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #include "soc_pins.h"
 #include "soc_power.h"

soc/arm/arm/mps2/soc.h

@@ -15,7 +15,7 @@
 #define __DSP_PRESENT             1U        /* DSP extension present */
 #endif
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <soc_registers.h>
 
 extern void wakeup_cpu1(void);

soc/arm/arm/musca_a/soc.h

@@ -9,7 +9,7 @@
 
 #ifndef _ASMLANGUAGE
 #include "system_cmsdk_musca.h"
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <sys/util.h>
 #endif
 

soc/arm/arm/musca_b1/soc.h

@@ -9,7 +9,7 @@
 
 #ifndef _ASMLANGUAGE
 #include "system_cmsdk_musca_b1.h"
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <sys/util.h>
 #endif
 

soc/arm/atmel_sam/sam3x/soc.h

@@ -36,7 +36,7 @@
 #endif
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #define ID_UART0   ID_UART
 #define UART0      UART

soc/arm/atmel_sam/same70/soc.h

@@ -67,7 +67,7 @@
 #include "../common/soc_gpio.h"
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #endif /* _ASMLANGUAGE */
 

soc/arm/nordic_nrf/nrf51/soc.h

@@ -16,7 +16,7 @@
 #include <nrfx.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/nordic_nrf/nrf52/soc.h

@@ -16,7 +16,7 @@
 #include <nrfx.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/nordic_nrf/nrf53/soc.h

@@ -17,7 +17,7 @@
 #include <nrfx.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/nordic_nrf/nrf91/soc.h

@@ -16,7 +16,7 @@
 #include <nrfx.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/nxp_imx/rt/linker.ld

@@ -5,7 +5,7 @@
  */
 
  #include <autoconf.h>
- #include <generated_dts_board.h>
+ #include <devicetree.h>
 
 MEMORY
      {

soc/arm/nxp_imx/rt/soc.h

@@ -14,7 +14,7 @@
 #include <fsl_common.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #ifdef __cplusplus
 extern "C" {

soc/arm/nxp_kinetis/k6x/soc.h

@@ -32,7 +32,7 @@
 #include <fsl_common.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/nxp_kinetis/k8x/soc.h

@@ -18,7 +18,7 @@ extern "C" {
 #include <fsl_common.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/nxp_kinetis/ke1xf/soc.h

@@ -14,7 +14,7 @@
 #include <fsl_common.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/nxp_kinetis/kl2x/soc.h

@@ -16,7 +16,7 @@
 #include <fsl_common.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/nxp_kinetis/kv5x/soc.h

@@ -18,7 +18,7 @@ extern "C" {
 #include <fsl_common.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/nxp_kinetis/kwx/soc.h

@@ -27,7 +27,7 @@
 #include <fsl_common.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/nxp_lpc/lpc54xxx/soc.h

@@ -20,7 +20,7 @@
 #include <fsl_common.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/nxp_lpc/lpc55xxx/soc.h

@@ -20,7 +20,7 @@
 #include <fsl_common.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/silabs_exx32/efr32mg12p/soc.h

@@ -20,7 +20,7 @@
 #include <em_common.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #include "soc_pinmap.h"
 #include "../common/soc_gpio.h"

soc/arm/st_stm32/stm32f4/soc.h

@@ -25,7 +25,7 @@
 #include <stm32f4xx.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #ifdef CONFIG_EXTI_STM32
 #include <stm32f4xx_ll_exti.h>

soc/arm/st_stm32/stm32f7/soc.h

@@ -24,7 +24,7 @@
 #include <stm32f7xx.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #ifdef CONFIG_EXTI_STM32
 #include <stm32f7xx_ll_exti.h>

soc/arm/st_stm32/stm32g0/soc.h

@@ -53,7 +53,7 @@
 #endif
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/st_stm32/stm32g4/soc.h

@@ -25,7 +25,7 @@
 #include <stm32g4xx.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #ifdef CONFIG_CLOCK_CONTROL_STM32_CUBE
 #include <stm32g4xx_ll_utils.h>

soc/arm/st_stm32/stm32l4/soc.h

@@ -27,7 +27,7 @@
 #include <stm32l4xx.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #ifdef CONFIG_EXTI_STM32
 #include <stm32l4xx_ll_exti.h>

soc/arm/st_stm32/stm32wb/soc.h

@@ -24,7 +24,7 @@
 #include <stm32wbxx.h>
 
 /* Add include for DTS generated information */
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #ifdef CONFIG_GPIO_STM32
 #include <stm32wbxx_ll_gpio.h>

soc/nios2/nios2-qemu/linker.ld

@@ -9,5 +9,5 @@
  */
 
 #include <layout.h>
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <arch/nios2/linker.ld>

soc/nios2/nios2f-zephyr/linker.ld

@@ -9,5 +9,5 @@
  */
 
 #include <layout.h>
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <arch/nios2/linker.ld>

soc/riscv/litex-vexriscv/soc.h

@@ -8,7 +8,7 @@
 #define __RISCV32_LITEX_VEXRISCV_SOC_H_
 
 #include "../riscv-privilege/common/soc_common.h"
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 /* lib-c hooks required RAM defined variables */
 #define RISCV_RAM_BASE              DT_INST_0_MMIO_SRAM_BASE_ADDRESS

soc/riscv/openisa_rv32m1/linker.ld

@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <autoconf.h>
 
 #include <linker/sections.h>

soc/riscv/riscv-privilege/miv/soc.h

@@ -5,7 +5,7 @@
 #define __RISCV32_MIV_SOC_H_
 
 #include <soc_common.h>
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 /* GPIO Interrupts */
 #define MIV_GPIO_0_IRQ           (0)

soc/riscv/riscv-privilege/sifive-freedom/soc.h

@@ -12,7 +12,7 @@
 #define __RISCV_SIFIVE_FREEDOM_SOC_H_
 
 #include <soc_common.h>
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 /* PINMUX Configuration */
 #define SIFIVE_PINMUX_0_BASE_ADDR     (DT_INST_0_SIFIVE_GPIO0_BASE_ADDRESS + 0x38)

soc/x86/apollo_lake/linker.ld

@@ -6,7 +6,7 @@
  */
 
 #include <autoconf.h>
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 #define PHYS_LOAD_ADDR	DT_PHYS_RAM_ADDR
 #define PHYS_RAM_ADDR	DT_PHYS_RAM_ADDR

soc/x86/atom/linker.ld

@@ -12,7 +12,7 @@
  */
 
 #include <autoconf.h>
-#include <generated_dts_board.h>
+#include <devicetree.h>
 /* physical address where the kernel is loaded */
 #define PHYS_LOAD_ADDR DT_PHYS_LOAD_ADDR
 
@@ -42,4 +42,3 @@ MEMORY
     }
 
 #include <arch/x86/ia32/linker.ld>
-

soc/x86/ia32/linker.ld

@@ -15,7 +15,7 @@
  */
 
 #include <autoconf.h>
-#include <generated_dts_board.h>
+#include <devicetree.h>
 
 /* physical address where the kernel is loaded */
 /* physical address of RAM */

soc/xtensa/esp32/linker.ld

@@ -11,7 +11,7 @@
  * Linker script for the Xtensa platform.
  */
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <autoconf.h>
 #include <linker/sections.h>
 #include <linker/linker-defs.h>

soc/xtensa/intel_s1000/linker.ld

@@ -13,7 +13,7 @@
 
 OUTPUT_ARCH(xtensa)
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include "memory.h"
 #include <autoconf.h>
 #include <linker/sections.h>

soc/xtensa/sample_controller/linker.ld

@@ -13,7 +13,7 @@
 #include <autoconf.h>
 #include <linker/sections.h>
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <linker/linker-defs.h>
 #include <linker/linker-tool.h>
 

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 <generated_dts_board.h>
+#include <devicetree.h>
 
 #define LL_SWI4_IRQn EMVSIM0_IRQn
 #define LL_SWI5_IRQn MUA_IRQn

subsys/dfu/img_util/flash_img.c

@@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <drivers/flash.h>
 #endif
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 /* 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

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 <generated_dts_board.h>
+#include <devicetree.h>
 
 /**
  * @def OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS

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