X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fdfu%2Fdfu.c;h=ceb33e35eed212e837a2f5571cea86f70c135806;hb=099c239d687cd48cc05f372b9f354ffcfeeba83c;hp=20dfcbbf18f23a4c2f5ce5fd420ca8881a2ae392;hpb=15e8cb70b4ebe79aced432323eaafcd176341017;p=u-boot

diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 20dfcbbf18..ceb33e35ee 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -35,7 +35,11 @@ static struct hash_algo *dfu_hash_algo;
  */
 __weak bool dfu_usb_get_reset(void)
 {
+#ifdef CONFIG_SPL_DFU_NO_RESET
+	return false;
+#else
 	return true;
+#endif
 }
 
 static int dfu_find_alt_num(const char *s)
@@ -482,7 +486,7 @@ int dfu_config_entities(char *env, char *interface, char *devstr)
 
 const char *dfu_get_dev_type(enum dfu_device_type t)
 {
-	const char *dev_t[] = {NULL, "eMMC", "OneNAND", "NAND", "RAM" };
+	const char *dev_t[] = {NULL, "eMMC", "OneNAND", "NAND", "RAM", "SF" };
 	return dev_t[t];
 }