diff options
| author | Tom Rini <[email protected]> | 2016-09-30 21:58:44 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2016-09-30 21:58:44 -0400 |
| commit | fe4ba689a0cb2bb2ceafb88556a57bd80814b648 (patch) | |
| tree | 1012656ba1d3e9f8288d69de33c71417b2f22466 /common/Makefile | |
| parent | f413d1cae89143ad45b066b3d3bc602deafcb50a (diff) | |
| parent | 4c043712e9910ef1d612aedbd8304a1f7348ef5f (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Signed-off-by: Tom Rini <[email protected]>
Conflicts:
include/configs/dra7xx_evm.h
Diffstat (limited to 'common/Makefile')
| -rw-r--r-- | common/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/common/Makefile b/common/Makefile index 9a9a065ad21..ecc23e6fd32 100644 --- a/common/Makefile +++ b/common/Makefile @@ -89,6 +89,8 @@ obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o endif # !CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD +obj-$(CONFIG_SPL_DFU_SUPPORT) += dfu.o +obj-$(CONFIG_SPL_DFU_SUPPORT) += cli_hush.o obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o @@ -171,6 +173,7 @@ obj-$(CONFIG_CMDLINE) += cli_simple.o obj-y += cli.o obj-$(CONFIG_CMDLINE) += cli_readline.o +obj-$(CONFIG_CMD_DFU) += dfu.o obj-y += command.o obj-y += s_record.o obj-y += xyzModem.o |