| Message ID | 1437811877-13764-5-git-send-email-l.majewski@majess.pl |
|---|---|
| State | Superseded |
| Delegated to: | Łukasz Majewski |
| Headers | show |
Hi Lukasz, On 25 July 2015 at 02:11, Lukasz Majewski <l.majewski@majess.pl> wrote: > This commit adds initial support for using tftp for downloading and > upgrading firmware on the device. > > Signed-off-by: Lukasz Majewski <l.majewski@majess.pl> > --- > Changes for v2: > - Return -ENOSYS instead of plain -1 > - Remove interface and devstring env variables reading in the dfu_tftp_write() > - Those parameters are now passed to dfu_tftp_write() function as its arguments > --- > drivers/dfu/Makefile | 1 + > drivers/dfu/dfu_tftp.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ > include/dfu.h | 13 ++++++++++ > 3 files changed, 79 insertions(+) > create mode 100644 drivers/dfu/dfu_tftp.c Is there a Kconfig option needed here? Regards, Simon
Hi Lukasz, On Sat, Jul 25, 2015 at 3:11 AM, Lukasz Majewski <l.majewski@majess.pl> wrote: > This commit adds initial support for using tftp for downloading and > upgrading firmware on the device. > > Signed-off-by: Lukasz Majewski <l.majewski@majess.pl> > --- > Changes for v2: > - Return -ENOSYS instead of plain -1 > - Remove interface and devstring env variables reading in the dfu_tftp_write() > - Those parameters are now passed to dfu_tftp_write() function as its arguments > --- Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Hi Simon, > Hi Lukasz, > > On 25 July 2015 at 02:11, Lukasz Majewski <l.majewski@majess.pl> > wrote: > > This commit adds initial support for using tftp for downloading and > > upgrading firmware on the device. > > > > Signed-off-by: Lukasz Majewski <l.majewski@majess.pl> > > --- > > Changes for v2: > > - Return -ENOSYS instead of plain -1 > > - Remove interface and devstring env variables reading in the > > dfu_tftp_write() > > - Those parameters are now passed to dfu_tftp_write() function as > > its arguments --- > > drivers/dfu/Makefile | 1 + > > drivers/dfu/dfu_tftp.c | 65 > > ++++++++++++++++++++++++++++++++++++++++++++++++++ > > include/dfu.h | 13 ++++++++++ 3 files changed, 79 > > insertions(+) create mode 100644 drivers/dfu/dfu_tftp.c > > Is there a Kconfig option needed here? I will add proper Kconfig option for this code in the following patch: [PATCH v2 8/9] config: bbb: Configs necessary for running update via TFTP on Beagle Bone Black IMHO this patch is a better place to do that. > > Regards, > Simon Best regards, Lukasz Majewski
diff --git a/drivers/dfu/Makefile b/drivers/dfu/Makefile index cebea30..61f2b71 100644 --- a/drivers/dfu/Makefile +++ b/drivers/dfu/Makefile @@ -10,3 +10,4 @@ obj-$(CONFIG_DFU_MMC) += dfu_mmc.o obj-$(CONFIG_DFU_NAND) += dfu_nand.o obj-$(CONFIG_DFU_RAM) += dfu_ram.o obj-$(CONFIG_DFU_SF) += dfu_sf.o +obj-$(CONFIG_DFU_TFTP) += dfu_tftp.o diff --git a/drivers/dfu/dfu_tftp.c b/drivers/dfu/dfu_tftp.c new file mode 100644 index 0000000..cd71708 --- /dev/null +++ b/drivers/dfu/dfu_tftp.c @@ -0,0 +1,65 @@ +/* + * (C) Copyright 2015 + * Lukasz Majewski <l.majewski@majess.pl> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <malloc.h> +#include <errno.h> +#include <dfu.h> + +int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, unsigned int len, + char *interface, char *devstring) +{ + char *s, *sb; + int alt_setting_num, ret; + struct dfu_entity *dfu; + + debug("%s: name: %s addr: 0x%x len: %d device: %s:%s\n", __func__, + dfu_entity_name, addr, len, interface, devstring); + + ret = dfu_init_env_entities(interface, devstring); + if (ret) + goto done; + + /* + * We need to copy name pointed by *dfu_entity_name since this text + * is the integral part of the FDT image. + * Any implicit modification (i.e. done by strsep()) will corrupt + * the FDT image and prevent other images to be stored. + */ + s = strdup(dfu_entity_name); + sb = s; + if (!s) { + ret = -ENOMEM; + goto done; + } + + strsep(&s, "@"); + debug("%s: image name: %s strlen: %d\n", __func__, sb, strlen(sb)); + + alt_setting_num = dfu_get_alt(sb); + free(sb); + if (alt_setting_num < 0) { + error("Alt setting [%d] to write not found!", + alt_setting_num); + ret = -ENODEV; + goto done; + } + + dfu = dfu_get_entity(alt_setting_num); + if (!dfu) { + error("DFU entity for alt: %d not found!", alt_setting_num); + ret = -ENODEV; + goto done; + } + + ret = dfu_write_from_mem_addr(dfu, (void *)addr, len); + +done: + dfu_free_entities(); + + return ret; +} diff --git a/include/dfu.h b/include/dfu.h index 7d31abd..7f78cc2 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -207,5 +207,18 @@ static inline int dfu_fill_entity_sf(struct dfu_entity *dfu, char *devstr, } #endif +#ifdef CONFIG_DFU_TFTP +int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, unsigned int len, + char *interface, char *devstring); +#else +static inline int dfu_tftp_write(char *dfu_entity_name, unsigned int addr, + unsigned int len, char *interface, + char *devstring) +{ + puts("TFTP write support for DFU not available!\n"); + return -ENOSYS; +} +#endif + int dfu_add(struct usb_configuration *c); #endif /* __DFU_ENTITY_H_ */
This commit adds initial support for using tftp for downloading and upgrading firmware on the device. Signed-off-by: Lukasz Majewski <l.majewski@majess.pl> --- Changes for v2: - Return -ENOSYS instead of plain -1 - Remove interface and devstring env variables reading in the dfu_tftp_write() - Those parameters are now passed to dfu_tftp_write() function as its arguments --- drivers/dfu/Makefile | 1 + drivers/dfu/dfu_tftp.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/dfu.h | 13 ++++++++++ 3 files changed, 79 insertions(+) create mode 100644 drivers/dfu/dfu_tftp.c