[U-Boot] [PATCH] dfu: Limit dfu_mmc to non-SPL case

Faiz Abbas faiz_abbas at ti.com
Wed Feb 14 14:29:46 UTC 2018


Since 82b9dc63 ("Only build cli_readline.o for CMDLINE on non-SPL"),
cli_simple.c is only being built for non-SPL case. However, dfu_mmc
requires cli_simple.c to build and dfu fails to build for SPL when
CONFIG_HUSH_PARSER is disabled.

Therefore, limit dfu_mmc to non-SPL case only.

Signed-off-by: Faiz Abbas <faiz_abbas at ti.com>
---
 drivers/dfu/Makefile | 2 ++
 drivers/dfu/dfu.c    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/drivers/dfu/Makefile b/drivers/dfu/Makefile
index 61f2b71..5628734 100644
--- a/drivers/dfu/Makefile
+++ b/drivers/dfu/Makefile
@@ -6,7 +6,9 @@
 #
 
 obj-$(CONFIG_USB_FUNCTION_DFU) += dfu.o
+ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_DFU_MMC) += dfu_mmc.o
+endif
 obj-$(CONFIG_DFU_NAND) += dfu_nand.o
 obj-$(CONFIG_DFU_RAM) += dfu_ram.o
 obj-$(CONFIG_DFU_SF) += dfu_sf.o
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 2c22b62..a16e10e 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -398,8 +398,10 @@ static int dfu_fill_entity(struct dfu_entity *dfu, char *s, int alt,
 
 	/* Specific for mmc device */
 	if (strcmp(interface, "mmc") == 0) {
+#ifndef CONFIG_SPL_BUILD
 		if (dfu_fill_entity_mmc(dfu, devstr, s))
 			return -1;
+#endif
 	} else if (strcmp(interface, "nand") == 0) {
 		if (dfu_fill_entity_nand(dfu, devstr, s))
 			return -1;
-- 
2.7.4



More information about the U-Boot mailing list