aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSander Vanheule <sander@svanheule.net>2021-09-01 21:15:57 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-09-09 23:36:13 +0200
commitdf63619eeafac0a6b41c26102a7aa4a0dea9aa16 (patch)
treeb0d9446555b85ae5d3ba48d8070a942f0fdfcff7 /tools
parent70c75965a97799b44871249c205bad48fea9a4ae (diff)
downloadupstream-df63619eeafac0a6b41c26102a7aa4a0dea9aa16.tar.gz
upstream-df63619eeafac0a6b41c26102a7aa4a0dea9aa16.tar.bz2
upstream-df63619eeafac0a6b41c26102a7aa4a0dea9aa16.zip
firmware-utils: tplink-safeloader: use revision field
The structured soft-version partition has a field which contains a (source) revision number. Factory images used to include this, but it was accidentaly removed during an earlier refactoring. Include the source revision number again in the generated soft-version partition. Additionaly, also show this revision number when printing image info. Fixes: 1a211af2cb3b ("firmware-utils: tplink-safeloader: refactor meta-partition generation") Signed-off-by: Sander Vanheule <sander@svanheule.net>
Diffstat (limited to 'tools')
-rw-r--r--tools/firmware-utils/Makefile2
-rw-r--r--tools/firmware-utils/src/tplink-safeloader.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
index 7b669ac0c6..ccc5e46091 100644
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME := firmware-utils
-PKG_RELEASE := 9
+PKG_RELEASE := 10
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/kernel.mk
diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
index 597c48b9d4..dcc9d877a9 100644
--- a/tools/firmware-utils/src/tplink-safeloader.c
+++ b/tools/firmware-utils/src/tplink-safeloader.c
@@ -2722,6 +2722,7 @@ static struct image_partition_entry make_soft_version(
.year_lo = bcd(tm->tm_year%100),
.month = bcd(tm->tm_mon+1),
.day = bcd(tm->tm_mday),
+ .rev = htonl(rev),
.compat_level = htonl(info->soft_ver_compat_level)
};
@@ -3411,6 +3412,7 @@ static int firmware_info(const char *input)
printf("Version: %d.%d.%d\n", s->version_major, s->version_minor, s->version_patch);
printf("Date: %02x%02x-%02x-%02x\n", s->year_hi, s->year_lo, s->month, s->day);
+ printf("Revision: %d\n", ntohl(s->rev));
} else {
printf("Failed to parse data\n");
}