diff options
| author | Tom Rini <trini@konsulko.com> | 2018-02-23 13:04:48 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-23 13:04:48 -0500 |
| commit | 1c124d379dbb78a93495202749efe952fbddba1c (patch) | |
| tree | 0a402df7f30b79cc9321061b778eb56ca0a5cea9 /common | |
| parent | 9ab81fcc8a0181cc19b8234d0e7632bd09c27c83 (diff) | |
| parent | b0cce3f90f546da0c1e0dda5abcaf05d81078b0d (diff) | |
Merge git://git.denx.de/u-boot-usb
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile | 6 | ||||
| -rw-r--r-- | common/spl/spl_sdp.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/common/Makefile b/common/Makefile index c7bde239c1..7011dada99 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_DFU_OVER_USB) += 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_DFU_OVER_USB) += dfu.o obj-y += command.o obj-$(CONFIG_$(SPL_)LOG) += log.o obj-$(CONFIG_$(SPL_)LOG_CONSOLE) += log_console.o diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c index 333d518f4d..0c4603a3db 100644 --- a/common/spl/spl_sdp.c +++ b/common/spl/spl_sdp.c @@ -24,13 +24,13 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image, ret = sdp_init(controller_index); if (ret) { - pr_err("SDP init failed: %d", ret); + pr_err("SDP init failed: %d\n", ret); return -ENODEV; } /* This command typically does not return but jumps to an image */ sdp_handle(controller_index); - pr_err("SDP ended"); + pr_err("SDP ended\n"); return -EINVAL; } |