The hashtype is actually a bitfield that contains flags for the different hash types and other information. Rename the field to flags and add constants for the flags in this field.
Signed-off-by: Michael Tretter <m.tret...@pengutronix.de> --- scripts/rkimage.c | 5 +++-- scripts/rockchip.h | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/rkimage.c b/scripts/rkimage.c index fd97bd1dd9f5967762d0a8bf9d186594a05a2a9f..39f9e44cceba2a9d961b014a6b1d24365f9327f9 100644 --- a/scripts/rkimage.c +++ b/scripts/rkimage.c @@ -76,11 +76,12 @@ static int create_newidb(struct newidb *idb) idb->magic = NEWIDB_MAGIC; idb->n_files = (n_code << 16) | (1 << 7) | (1 << 8); + idb->flags = 0; if (hash_type == HASH_TYPE_SHA256) - idb->hashtype = (1 << 0); + idb->flags |= NEWIDB_FLAGS_SHA256; else if (hash_type == HASH_TYPE_SHA512) - idb->hashtype = (1 << 1); + idb->flags |= NEWIDB_FLAGS_SHA512; if (!keep_cert) image_offset = 4; diff --git a/scripts/rockchip.h b/scripts/rockchip.h index 2d060fdefe909118d157a7aafef3284a35679fe3..8033878b34d369c7e291f38fd2a4beaaf395556b 100644 --- a/scripts/rockchip.h +++ b/scripts/rockchip.h @@ -3,6 +3,9 @@ #define NEWIDB_MAGIC 0x534e4b52 /* 'RKNS' */ +#define NEWIDB_FLAGS_SHA256 (1U << 0) +#define NEWIDB_FLAGS_SHA512 (1U << 1) + struct newidb_entry { uint32_t sector; uint32_t unknown_ffffffff; @@ -16,7 +19,7 @@ struct newidb { uint32_t magic; unsigned char unknown1[4]; uint32_t n_files; - uint32_t hashtype; + uint32_t flags; unsigned char unknown2[8]; unsigned char unknown3[8]; unsigned char unknown4[88]; -- 2.39.5