KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

firmware-utils: mktplinkfw2: respect -e option when reading fw info

Browse source 
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 <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki 2017-07-23 22:19:21 +02:00
parent 35ddef8455
commit 993c740255
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/firmware-utils/src/mktplinkfw2.c
View file

@ -794,8 +794,10 @@ static int inspect_fw(void)
hdr = (struct fw_header *)buf; hdr = (struct fw_header *)buf;
board = find_board_by_hwid(ntohl(hdr->hw_id)); 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_la = bswap_32(hdr->kernel_la);
hdr->kernel_ep = bswap_32(hdr->kernel_ep); 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); inspect_fw_pstr("Firmware version", hdr->fw_version);
if (board) { if (board != &custom_board) {
layout = find_layout(board->layout_id); layout = find_layout(board->layout_id);
inspect_fw_phexpost("Hardware ID", inspect_fw_phexpost("Hardware ID",
ntohl(hdr->hw_id), board->id); ntohl(hdr->hw_id), board->id);
@ -872,7 +874,7 @@ static int inspect_fw(void)
ntohl(hdr->kernel_ofs)); ntohl(hdr->kernel_ofs));
inspect_fw_phexdec("Kernel data length", inspect_fw_phexdec("Kernel data length",
ntohl(hdr->kernel_len)); ntohl(hdr->kernel_len));
if (board) { if (board != &custom_board) {
inspect_fw_phexdef("Kernel load address", inspect_fw_phexdef("Kernel load address",
ntohl(hdr->kernel_la), ntohl(hdr->kernel_la),
layout ? layout->kernel_la : 0xffffffff); layout ? layout->kernel_la : 0xffffffff);