Merge changes from topic "dt_compression" am: 500cadc85a

am: b59dbe8eb4

Change-Id: I3cee3500689183a84b1b8b82fa8a6f5946dfafe7

2 files changed, 19 insertions, 1 deletions

diff --git a/utils/README.md b/utils/README.md
index 6fa3409..fa326ee 100644
--- a/utils/README.md
+++ b/utils/README.md
@@ -3,7 +3,7 @@ libufdt `utils` folder
 
 This folder contains utilities for device tree overlay.
 
-mkdtimg
+mkdtimg (DEPRECATED, use mkdtboimg.py instead.)
 -------
 
 If your DTB/DTBO is in an unique partition, e.g. `dtb` and `dtbo` partition.
diff --git a/utils/src/dt_table.h b/utils/src/dt_table.h
index 831b80f..fc37941 100644
--- a/utils/src/dt_table.h
+++ b/utils/src/dt_table.h
@@ -46,6 +46,12 @@ struct dt_table_header {
                                  struct is updated. */
 };
 
+enum dt_compression_info {
+    NO_COMPRESSION,
+    ZLIB_COMPRESSION,
+    GZIP_COMPRESSION
+};
+
 struct dt_table_entry {
   uint32_t dt_size;
   uint32_t dt_offset;         /* offset from head of dt_table_header */
@@ -55,6 +61,18 @@ struct dt_table_entry {
   uint32_t custom[4];         /* optional, must be zero if unused */
 };
 
+struct dt_table_entry_v1 {
+  uint32_t dt_size;
+  uint32_t dt_offset;         /* offset from head of dt_table_header */
+
+  uint32_t id;                /* optional, must be zero if unused */
+  uint32_t rev;               /* optional, must be zero if unused */
+  uint32_t flags;             /* For version 1 of dt_table_header, the 4 least significant bits
+                                 of 'flags' will be used indicate the compression
+                                 format of the DT entry as per the enum 'dt_compression_info' */
+  uint32_t custom[3];         /* optional, must be zero if unused */
+};
+
 void dt_table_header_init(struct dt_table_header *header);
 
 #endif