From: Rafał Miłecki <rafal@milecki.pl>
Date: Mon, 13 Nov 2017 22:54:18 +0000 (+0100)
Subject: otrx: always align image to 0x1000
X-Git-Tag: v18.06.0-rc1~1730
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b15c5639299152f526ee95e333198632e0827470;p=oweals%2Fopenwrt.git

otrx: always align image to 0x1000

This seems to match what the original trx tool and mjn3's replacement
do.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/package/utils/otrx/src/otrx.c b/package/utils/otrx/src/otrx.c
index 7e117c6e0d..add111aa61 100644
--- a/package/utils/otrx/src/otrx.c
+++ b/package/utils/otrx/src/otrx.c
@@ -1,7 +1,7 @@
 /*
  * otrx
  *
- * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com>
+ * Copyright (C) 2015-2017 Rafał Miłecki <zajec5@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -408,6 +408,12 @@ static int otrx_create(int argc, char **argv) {
 			break;
 	}
 
+	sbytes = otrx_create_align(trx, curr_offset, 0x1000);
+	if (sbytes < 0)
+		fprintf(stderr, "Failed to append zeros\n");
+	else
+		curr_offset += sbytes;
+
 	hdr.length = curr_offset;
 	otrx_create_write_hdr(trx, &hdr);
 err_close: