diff options
author | Tom Rini <trini@konsulko.com> | 2022-09-18 08:34:31 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-09-18 08:34:31 -0400 |
commit | b6c50e5831f6ce3800d4b3cf3c7aa35dde8c48d9 (patch) | |
tree | 4403d1b2ff259014c01855e08191ad0d1c294741 /drivers/mtd/nand/raw/nand_util.c | |
parent | d219fc06b30d4b1ac4fac6c40b2ca69cb5ecf642 (diff) | |
parent | 8695fbb3a7ff3640eff62f7123323b16546d5b35 (diff) |
Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-watchdog into next
- Migrate watchdog reset to cyclic infrastructure (Stefan)
Diffstat (limited to 'drivers/mtd/nand/raw/nand_util.c')
-rw-r--r-- | drivers/mtd/nand/raw/nand_util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/nand/raw/nand_util.c b/drivers/mtd/nand/raw/nand_util.c index 5150607d8a..b2345dca7f 100644 --- a/drivers/mtd/nand/raw/nand_util.c +++ b/drivers/mtd/nand/raw/nand_util.c @@ -103,7 +103,7 @@ int nand_erase_opts(struct mtd_info *mtd, erased_length < erase_length; erase.addr += mtd->erasesize) { - WATCHDOG_RESET(); + schedule(); if (opts->lim && (erase.addr >= (opts->offset + opts->lim))) { puts("Size of erase exceeds limit\n"); @@ -638,7 +638,7 @@ int nand_write_skip_bad(struct mtd_info *mtd, loff_t offset, size_t *length, size_t block_offset = offset & (mtd->erasesize - 1); size_t write_size, truncated_write_size; - WATCHDOG_RESET(); + schedule(); if (nand_block_isbad(mtd, block_start)) { printf("Skip bad block 0x%08llx\n", block_start); @@ -753,7 +753,7 @@ int nand_read_skip_bad(struct mtd_info *mtd, loff_t offset, size_t *length, size_t block_offset = offset & (mtd->erasesize - 1); size_t read_length; - WATCHDOG_RESET(); + schedule(); if (nand_block_isbad(mtd, offset & ~(mtd->erasesize - 1))) { printf("Skipping bad block 0x%08llx\n", |