From 5389db72e3265198986dfb50a831fb8f8264d346 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Mon, 11 Mar 2019 18:05:31 +0100 Subject: fritz-tools: add support for IPQ40xx platform AVM devices based on Qualcomm IPQ40xx do not store sector health information in the OOB area. Make this check optional to support this platform. Signed-off-by: David Bauer --- package/utils/fritz-tools/src/fritz_tffs_nand_read.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'package/utils/fritz-tools') diff --git a/package/utils/fritz-tools/src/fritz_tffs_nand_read.c b/package/utils/fritz-tools/src/fritz_tffs_nand_read.c index db77d2f5b4..ded0577cf3 100644 --- a/package/utils/fritz-tools/src/fritz_tffs_nand_read.c +++ b/package/utils/fritz-tools/src/fritz_tffs_nand_read.c @@ -67,6 +67,7 @@ static char *mtddev; static char *name_filter = NULL; static bool show_all = false; static bool print_all_key_names = false; +static bool read_oob_sector_health = false; static bool swap_bytes = false; static uint8_t readbuf[TFFS_SECTOR_SIZE]; static uint8_t oobbuf[TFFS_SECTOR_OOB_SIZE]; @@ -191,7 +192,7 @@ static int find_entry(uint32_t id, struct tffs_entry *entry) uint32_t read_id = read_uint32(readbuf, 0x00); uint32_t read_len = read_uint32(readbuf, 0x04); uint32_t read_rev = read_uint32(readbuf, 0x0c); - if (oob_id != read_id || oob_len != read_len || oob_rev != read_rev) { + if (read_oob_sector_health && (oob_id != read_id || oob_len != read_len || oob_rev != read_rev)) { fprintf(stderr, "Warning: sector has inconsistent metadata\n"); continue; } @@ -360,6 +361,9 @@ static int show_matching_key_value(struct tffs_key_name_table *key_names) static int check_sector(off_t pos) { + if (!read_oob_sector_health) { + return 1; + } if (read_sectoroob(pos)) { return 0; } @@ -450,6 +454,7 @@ static void usage(int status) " -h show this screen\n" " -l list all supported keys\n" " -n display the value of the given key\n" + " -o read OOB information about sector health\n" ); exit(status); @@ -460,7 +465,7 @@ static void parse_options(int argc, char *argv[]) while (1) { int c; - c = getopt(argc, argv, "abd:hln:"); + c = getopt(argc, argv, "abd:hln:o"); if (c == -1) break; @@ -489,6 +494,9 @@ static void parse_options(int argc, char *argv[]) show_all = false; print_all_key_names = false; break; + case 'o': + read_oob_sector_health = true; + break; default: usage(EXIT_FAILURE); break; -- cgit v1.2.3