 +#ifdef CONFIG_DFU_TIMEOUT
 +	"    [timeout] - specify inactivity timeout in sec, doesn't work with list\n"
 +#endif
- #ifdef CONFIG_DFU_TFTP
- 	"dfu tftp <interface> <dev> [<addr>]\n"
- 	"  - device firmware upgrade via TFTP\n"
+ #endif
+ #ifdef CONFIG_DFU_OVER_TFTP
+ #ifdef CONFIG_DFU_OVER_USB
 diff --git a/common/dfu.c b/common/dfu.c
 index 07dff317a6..2f6a73b48f 100644
 --- a/common/dfu.c

 CONFIG_DFU_RAM=y
 CONFIG_DM_PCI_COMPAT=y
diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig
index 56a98f5273..97e8071819 100644
--- a/drivers/dfu/Kconfig
+++ b/drivers/dfu/Kconfig
@@ -12,6 +12,12 @@ config DFU_TFTP
 
 	  Detailed description of this feature can be found at ./doc/README.dfutftp
 

From 602d867fe5581718942a631a76d9e222e44346b6 Mon Sep 17 00:00:00 2001
From: Brad <bradjc5@gmail.com>
Date: Thu, 25 May 2017 14:16:31 -0400
Subject: [PATCH] HACK: dfu: add optional timeout

When the `dfu` command is called from the U-Boot environment, it now
accepts an optional fourth parameter that specifies a timeout (in
