Merge branch 'next'

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 */

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);
 	}

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);