Hi Paweł,

In current state dfu depends on cmd/mtdparts.c which isn't build in SPL.
This patch resolves it by cutting out unwanted code in SPL build.

Signed-off-by: Paweł Jarosz <paweljarosz3...@gmail.com>
---
Changes since v1:
- none

Changes since v2:
- none

 drivers/dfu/dfu_nand.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c
index 6dc9ff7..a196233 100644
--- a/drivers/dfu/dfu_nand.c
+++ b/drivers/dfu/dfu_nand.c
@@ -192,8 +192,9 @@ unsigned int dfu_polltimeout_nand(struct dfu_entity *dfu)
 int dfu_fill_entity_nand(struct dfu_entity *dfu, char *devstr, char *s)
 {
        char *st;
+#ifndef CONFIG_SPL_BUILD
        int ret, dev, part;
-
+#endif
        dfu->data.nand.ubi = 0;
        dfu->dev_type = DFU_DEV_NAND;
        st = strsep(&s, " ");
@@ -203,6 +204,7 @@ int dfu_fill_entity_nand(struct dfu_entity *dfu, char 
*devstr, char *s)
                s++;
                dfu->data.nand.size = simple_strtoul(s, &s, 16);
        } else if ((!strcmp(st, "part")) || (!strcmp(st, "partubi"))) {
+#ifndef CONFIG_SPL_BUILD
                char mtd_id[32];
                struct mtd_device *mtd_dev;
                u8 part_num;
@@ -220,6 +222,7 @@ int dfu_fill_entity_nand(struct dfu_entity *dfu, char 
*devstr, char *s)
                mtdparts_init();

                ret = find_dev_and_part(mtd_id, &mtd_dev, &part_num, &pi);
+

I think that this blank line is not needed.

Otherwise,

Acked-by: Łukasz Majewski <lu...@denx.de>

                if (ret != 0) {
                        printf("Could not locate '%s'\n", mtd_id);
                        return -1;
@@ -229,6 +232,7 @@ int dfu_fill_entity_nand(struct dfu_entity *dfu, char 
*devstr, char *s)
                dfu->data.nand.size = pi->size;
                if (!strcmp(st, "partubi"))
                        dfu->data.nand.ubi = 1;
+#endif
        } else {
                printf("%s: Memory layout (%s) not supported!\n", __func__, st);
                return -1;



--
Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Reply via email to