[source] tools/firmware-utils: mktplinkfw2: allow parameter override

[LEDE Commits]

mkresin pushed a commit to source.git, branch master:
https://git.lede-project.org/66a8c8f04c7ab341aaa65e18c3af276fa70d5b56

commit 66a8c8f04c7ab341aaa65e18c3af276fa70d5b56
Author: Thibaut VARENE <hacks at slashdirt.org>
AuthorDate: Fri Jul 28 12:59:42 2017 +0200

    tools/firmware-utils: mktplinkfw2: allow parameter override
    
    This patch enables commandline override of board hw_ver and hw_ver_add
    
    Signed-off-by: Thibaut VARENE <hacks at slashdirt.org>
---
 tools/firmware-utils/src/mktplinkfw2.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/tools/firmware-utils/src/mktplinkfw2.c b/tools/firmware-utils/src/mktplinkfw2.c
index 56330c0..7d09477 100644
--- a/tools/firmware-utils/src/mktplinkfw2.c
+++ b/tools/firmware-utils/src/mktplinkfw2.c
@@ -424,17 +424,15 @@ static int check_options(void)
 
 		board->hw_id = strtoul(opt_hw_id, NULL, 0);
 
-		if (opt_hw_rev)
-			board->hw_rev = strtoul(opt_hw_rev, NULL, 0);
-		else
-			board->hw_rev = 1;
-
-		if (opt_hw_ver_add)
-			board->hw_ver_add = strtoul(opt_hw_ver_add, NULL, 0);
-		else
-			board->hw_ver_add = 0;
+		board->hw_rev = 1;
+		board->hw_ver_add = 0;
 	}
 
+	if (opt_hw_rev)
+		board->hw_rev = strtoul(opt_hw_rev, NULL, 0);
+	if (opt_hw_ver_add)
+		board->hw_ver_add = strtoul(opt_hw_ver_add, NULL, 0);
+
 	layout = find_layout(layout_id);
 	if (layout == NULL) {
 		ERR("unknown flash layout \"%s\"", layout_id);