diff options
author | Hridya Valsaraju <hridya@google.com> | 2018-07-09 10:45:27 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-07-09 10:45:27 -0700 |
commit | b59dbe8eb4cdef68a676b7aa3cb416f94d5ce8ec (patch) | |
tree | 9d37afcfd07233aa55fed386e29c9b9678c8c6f4 | |
parent | 5d2e7aa488e042d3a93eccd26b6f6045ea1d8676 (diff) | |
parent | 500cadc85acc11ca4c6ca0a652a3a3b9e1ea1a0a (diff) | |
download | libufdt-b59dbe8eb4cdef68a676b7aa3cb416f94d5ce8ec.tar.gz |
Merge changes from topic "dt_compression"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
am: 500cadc85a
Change-Id: I9e44dbb66c6de9f2be917859e258b668c6f1e04a
-rw-r--r-- | utils/README.md | 2 | ||||
-rw-r--r-- | utils/src/dt_table.h | 18 |
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 |