[source] firmware-utils: mktplinkfw2: fix info for images with LE kernel LA/EP

LEDE Commits lede-commits at lists.infradead.org
Mon Jul 31 02:44:01 PDT 2017


rmilecki pushed a commit to source.git, branch master:
https://git.lede-project.org/35ddef8455d9c4719b77735813d506130b5c4144

commit 35ddef8455d9c4719b77735813d506130b5c4144
Author: Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Sun Jul 23 22:19:20 2017 +0200

    firmware-utils: mktplinkfw2: fix info for images with LE kernel LA/EP
    
    With this change endianness is also respected when reading firmware
    info.
    
    Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
---
 tools/firmware-utils/src/mktplinkfw2.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/firmware-utils/src/mktplinkfw2.c b/tools/firmware-utils/src/mktplinkfw2.c
index 9052205..f7bfed8 100644
--- a/tools/firmware-utils/src/mktplinkfw2.c
+++ b/tools/firmware-utils/src/mktplinkfw2.c
@@ -793,6 +793,13 @@ static int inspect_fw(void)
 		goto out_free_buf;
 	hdr = (struct fw_header *)buf;
 
+	board = find_board_by_hwid(ntohl(hdr->hw_id));
+
+	if (board && board->flags & FLAG_LE_KERNEL_LA_EP) {
+		hdr->kernel_la = bswap_32(hdr->kernel_la);
+		hdr->kernel_ep = bswap_32(hdr->kernel_ep);
+	}
+
 	inspect_fw_pstr("File name", inspect_info.file_name);
 	inspect_fw_phexdec("File size", inspect_info.file_size);
 
@@ -838,7 +845,6 @@ static int inspect_fw(void)
 
 	inspect_fw_pstr("Firmware version", hdr->fw_version);
 
-	board = find_board_by_hwid(ntohl(hdr->hw_id));
 	if (board) {
 		layout = find_layout(board->layout_id);
 		inspect_fw_phexpost("Hardware ID",



More information about the lede-commits mailing list