From 993c740255ae5f170f8b6b96083e457e1546fae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Sun, 23 Jul 2017 22:19:21 +0200 Subject: [PATCH] firmware-utils: mktplinkfw2: respect -e option when reading fw info MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When -e option it specified a corresponding flag is set in the custom_board. By using custom_board as fallback -e option gets respected for unknown boards. Signed-off-by: Rafał Miłecki --- tools/firmware-utils/src/mktplinkfw2.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/firmware-utils/src/mktplinkfw2.c b/tools/firmware-utils/src/mktplinkfw2.c index f7bfed875f..56330c011e 100644 --- a/tools/firmware-utils/src/mktplinkfw2.c +++ b/tools/firmware-utils/src/mktplinkfw2.c @@ -794,8 +794,10 @@ static int inspect_fw(void) hdr = (struct fw_header *)buf; board = find_board_by_hwid(ntohl(hdr->hw_id)); + if (!board) + board = &custom_board; - if (board && board->flags & FLAG_LE_KERNEL_LA_EP) { + if (board->flags & FLAG_LE_KERNEL_LA_EP) { hdr->kernel_la = bswap_32(hdr->kernel_la); hdr->kernel_ep = bswap_32(hdr->kernel_ep); } @@ -845,7 +847,7 @@ static int inspect_fw(void) inspect_fw_pstr("Firmware version", hdr->fw_version); - if (board) { + if (board != &custom_board) { layout = find_layout(board->layout_id); inspect_fw_phexpost("Hardware ID", ntohl(hdr->hw_id), board->id); @@ -872,7 +874,7 @@ static int inspect_fw(void) ntohl(hdr->kernel_ofs)); inspect_fw_phexdec("Kernel data length", ntohl(hdr->kernel_len)); - if (board) { + if (board != &custom_board) { inspect_fw_phexdef("Kernel load address", ntohl(hdr->kernel_la), layout ? layout->kernel_la : 0xffffffff);