From 72b9e5cc857d51b16718f7848dfbd3b90a5c8eef Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 1 Dec 2020 17:54:31 -0800 Subject: [PATCH] npdmtool: be friendlier about disable das field --- src/npdmtool.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/npdmtool.c b/src/npdmtool.c index 28314cb..dfe3e1a 100644 --- a/src/npdmtool.c +++ b/src/npdmtool.c @@ -362,12 +362,10 @@ int CreateNpdm(const char *json, void **dst, u32 *dst_size) { } header.MmuFlags |= is_64_bit; - int disable_device_address_space_merge; - if (!cJSON_GetBoolean(npdm_json, "disable_device_address_space_merge", &disable_device_address_space_merge)) { - status = 0; - goto NPDM_BUILD_END; + int disable_device_address_space_merge; // optional + if (cJSON_GetBoolean(npdm_json, "disable_device_address_space_merge", &disable_device_address_space_merge)) { + header.MmuFlags |= ((disable_device_address_space_merge & 1) << 5); } - header.MmuFlags |= ((disable_device_address_space_merge & 1) << 5); /* ACID. */ memset(acid->Signature, 0, sizeof(acid->Signature));