diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-03 22:39:46 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-03 22:39:46 +0300 |
| commit | 2d4591353452638132d711551fec3495b7644731 (patch) | |
| tree | e12058de7f553e84f8d13e545f130c7a48973589 /fs | |
| parent | 4debc57a3da6c3f4d3f89a637e99206f4cea0a96 (diff) | |
| parent | 6ee6e15975cad3c99fad3a66223f3fd9287a369b (diff) | |
| download | u-boot-2d4591353452638132d711551fec3495b7644731.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cramfs/uncompress.c | 3 | ||||
| -rw-r--r-- | fs/fat/fat.c | 4 | ||||
| -rw-r--r-- | fs/jffs2/jffs2_1pass.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c index f431cc46c1..0d071b69f4 100644 --- a/fs/cramfs/uncompress.c +++ b/fs/cramfs/uncompress.c @@ -21,6 +21,7 @@ */ #include <common.h> +#include <cyclic.h> #include <malloc.h> #include <watchdog.h> #include <u-boot/zlib.h> @@ -62,7 +63,7 @@ int cramfs_uncompress_init (void) stream.avail_in = 0; #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) - stream.outcb = (cb_func) WATCHDOG_RESET; + stream.outcb = (cb_func)cyclic_run; #else stream.outcb = Z_NULL; #endif /* CONFIG_HW_WATCHDOG */ diff --git a/fs/fat/fat.c b/fs/fat/fat.c index df9ea2c028..a945904785 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -1144,8 +1144,8 @@ int file_fat_detectfs(void) return 1; } - if (IS_ENABLED(CONFIG_HAVE_BLOCK_DEVICE)) { - printf("Interface: %s\n", blk_get_if_type_name(cur_dev->if_type)); + if (blk_enabled()) { + printf("Interface: %s\n", blk_get_uclass_name(cur_dev->uclass_id)); printf(" Device %d: ", cur_dev->devnum); dev_print(cur_dev); } diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index ef7b302725..49ba82ef95 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -1523,7 +1523,7 @@ jffs2_1pass_build_lists(struct part_info * part) /* Set buf_size to maximum length */ buf_size = DEFAULT_EMPTY_SCAN_SIZE; - WATCHDOG_RESET(); + schedule(); #ifdef CONFIG_JFFS2_SUMMARY buf_len = sizeof(*sm); |