diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2018-02-16 16:41:17 +0100 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2018-02-21 20:28:15 +0100 |
| commit | 0f44d33536a50ef65259c322fa2d4a058585caf9 (patch) | |
| tree | f5d6bdf37d4651509051faa0efd7c4de415d764b /common/Makefile | |
| parent | 462c117ce045571fef86f88fad3be8b3117897b1 (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 'common/Makefile')
| -rw-r--r-- | common/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/common/Makefile b/common/Makefile index c7bde239c1..cdd0ab19d8 100644 --- a/common/Makefile +++ b/common/Makefile @@ -66,7 +66,9 @@ endif # !CONFIG_SPL_BUILD obj-$(CONFIG_$(SPL_TPL_)BOOTSTAGE) += bootstage.o ifdef CONFIG_SPL_BUILD -obj-$(CONFIG_SPL_DFU_SUPPORT) += dfu.o +ifdef CONFIG_SPL_DFU_SUPPORT +obj-$(CONFIG_USB_FUNCTION_DFU) += dfu.o +endif obj-$(CONFIG_SPL_DFU_SUPPORT) += cli_hush.o obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o @@ -128,7 +130,7 @@ endif obj-y += cli.o obj-$(CONFIG_FSL_DDR_INTERACTIVE) += cli_simple.o cli_readline.o -obj-$(CONFIG_CMD_DFU) += dfu.o +obj-$(CONFIG_USB_FUNCTION_DFU) += dfu.o obj-y += command.o obj-$(CONFIG_$(SPL_)LOG) += log.o obj-$(CONFIG_$(SPL_)LOG_CONSOLE) += log_console.o |