summaryrefslogtreecommitdiff
path: root/drivers/dfu
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2018-02-16 16:41:17 +0100
committerMarek Vasut <marex@denx.de>2018-02-21 20:28:15 +0100
commit0f44d33536a50ef65259c322fa2d4a058585caf9 (patch)
treef5d6bdf37d4651509051faa0efd7c4de415d764b /drivers/dfu
parent462c117ce045571fef86f88fad3be8b3117897b1 (diff)
dfu: Fix up the Kconfig mess
Clean up the screaming mess of configuration options that DFU is. It was impossible to configure DFU such that TFTP is enabled and USB is not, this patch fixes that and assures that DFU TFTP and DFU USB can be enabled separatelly and that the correct pieces of code are compiled in. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Lukasz Majewski <lukma@denx.de>
Diffstat (limited to 'drivers/dfu')
-rw-r--r--drivers/dfu/Kconfig12
-rw-r--r--drivers/dfu/Makefile2
2 files changed, 12 insertions, 2 deletions
diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig
index fa27efbb40..b077444059 100644
--- a/drivers/dfu/Kconfig
+++ b/drivers/dfu/Kconfig
@@ -1,12 +1,22 @@
menu "DFU support"
+config DFU
+ bool
+ imply USB_FUNCTION_DFU if USB_GADGET
+
config USB_FUNCTION_DFU
bool
select HASH
+ depends on USB_GADGET
+
+config TFTP_FUNCTION_DFU
+ bool
+ depends on NET
-if CMD_DFU
+if DFU
config DFU_TFTP
bool "DFU via TFTP"
+ select TFTP_FUNCTION_DFU
help
This option allows performing update of DFU-managed medium with data
sent via TFTP boot.
diff --git a/drivers/dfu/Makefile b/drivers/dfu/Makefile
index 61f2b71f91..7f35871ddc 100644
--- a/drivers/dfu/Makefile
+++ b/drivers/dfu/Makefile
@@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+
#
-obj-$(CONFIG_USB_FUNCTION_DFU) += dfu.o
+obj-$(CONFIG_DFU) += dfu.o
obj-$(CONFIG_DFU_MMC) += dfu_mmc.o
obj-$(CONFIG_DFU_NAND) += dfu_nand.o
obj-$(CONFIG_DFU_RAM) += dfu_ram.o