commit e96b6873bd8a64185796ac47b941f56dd29b6e3f
author Ulf Magnusson <Ulf.Magnusson@nordicsemi.no> Mon Jan 13 12:06:44 2020 +0100
committer Carles Cufí <carles.cufi@nordicsemi.no> Thu Jan 16 11:41:28 2020 +0100
tree e1bd5ac08b9005b20cae0de742a87eba4cb14b3d
parent 1f50892096e7e676669936ec0d8471aedf93dd8f

dts: Include devicetree.h instead of generated_dts_board.h

Needed for https://github.com/zephyrproject-rtos/zephyr/pull/20757, to
avoid a warning-turned-error.

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

boot/zephyr/include/sysflash/sysflash.h

diff --git a/boot/zephyr/include/sysflash/sysflash.h b/boot/zephyr/include/sysflash/sysflash.h
index 25487ee..e745ffa 100644
--- a/boot/zephyr/include/sysflash/sysflash.h
+++ b/boot/zephyr/include/sysflash/sysflash.h
@@ -3,7 +3,7 @@
 #ifndef __SYSFLASH_H__
 #define __SYSFLASH_H__
 
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <mcuboot_config/mcuboot_config.h>
 
 #if (MCUBOOT_IMAGE_NUMBER == 1)

ext/nrf/cc310_glue.h

diff --git a/ext/nrf/cc310_glue.h b/ext/nrf/cc310_glue.h
index 37a0875..92f03c8 100644
--- a/ext/nrf/cc310_glue.h
+++ b/ext/nrf/cc310_glue.h
@@ -10,7 +10,7 @@
 #include <nrf_cc310_bl_init.h>
 #include <nrf_cc310_bl_hash_sha256.h>
 #include <nrf_cc310_bl_ecdsa_verify_secp256r1.h>
-#include <generated_dts_board.h>
+#include <devicetree.h>
 #include <string.h>
 
 typedef nrf_cc310_bl_hash_context_sha256_t bootutil_sha256_context;

scripts/assemble.py

diff --git a/scripts/assemble.py b/scripts/assemble.py
index cd0b966..265a78e 100755
--- a/scripts/assemble.py
+++ b/scripts/assemble.py
@@ -50,7 +50,7 @@
     def find_slots(self, bootdir):
         offsets = {}
         sizes = {}
-        with open(os.path.join(bootdir, 'zephyr', 'include', 'generated', 'generated_dts_board_unfixed.h'), 'r') as fd:
+        with open(os.path.join(bootdir, 'zephyr', 'include', 'generated', 'devicetree_unfixed.h'), 'r') as fd:
             for line in fd:
                 m = offset_re.match(line)
                 if m is not None:
@@ -60,7 +60,7 @@
                     sizes[m.group(1)] = int(m.group(3), 0)
 
         if not same_keys(offsets, sizes):
-            raise Exception("Inconsistent data in generated_dts_board.h")
+            raise Exception("Inconsistent data in devicetree.h")
 
         # We care about the MCUBOOT, IMAGE_0, and IMAGE_1 partitions.
         if 'MCUBOOT' not in offsets:

sim/mcuboot-sys/csupport/devicetree.h

diff --git a/sim/mcuboot-sys/csupport/generated_dts_board.h b/sim/mcuboot-sys/csupport/devicetree.h
similarity index 76%
rename from sim/mcuboot-sys/csupport/generated_dts_board.h
rename to sim/mcuboot-sys/csupport/devicetree.h
index f5e11f8..f268640 100644
--- a/sim/mcuboot-sys/csupport/generated_dts_board.h
+++ b/sim/mcuboot-sys/csupport/devicetree.h
@@ -6,8 +6,8 @@
 
 /* This file mocks zephyr's autogenerated DT output header file */
 
-#ifndef __GENERATED_DTS_BOARD_H__
-#define __GENERATED_DTS_BOARD_H__
+#ifndef __DEVICETREE_H__
+#define __DEVICETREE_H__
 
 #define DT_FLASH_AREA_IMAGE_0_ID 1
 #define DT_FLASH_AREA_IMAGE_1_ID 2
@@ -15,4 +15,4 @@
 #define DT_FLASH_AREA_IMAGE_2_ID 4
 #define DT_FLASH_AREA_IMAGE_3_ID 5
 
-#endif /*__GENERATED_DTS_BOARD_H__*/
+#endif /*__DEVICETREE_H__*/