dfu: update dfu stack and add MTD backend
v3 cover dfu: update dfu stack and add MTD backend
This serie based on v2019.10 propose updates on the DFU stack:
- add capability to have several DFU backend running in parallel
- add MTD backend for update of NAND, NOR or SPI-NAND
- add VIRTUAL backend for board/command specific behavior
- add some weak callback
This v2 patchset:
+ solves compilation for dependancy with CONFIG_CMD_MTDPARTS
+ solves bad block management for NAND in the erase loops (copied from MTD command), the previous was functional only on SPI-NAND. But I detect issue for NAND; when bad block is detected fail_addr is not updated.
See the complete analysis on the issue (reproduced in MTD command) in http://patchwork.ozlabs.org/patch/1165056/
"cmd: mtd: solve bad block support in erase command" The better solution is a MTD backport from Linux, but udpate the loop is functional for SPI-NAND and NAND.
To test the new features and as example, I update the stm32mp1 board to use the new features; I test them with the command "dfu 0" (for test I have dependency with patch
http://patchwork.ozlabs.org/patch/1162076/)
The expected target of the dfu part for this serie is v2020.01. I will merge the stm32mp1 part when they will be accepted by dfu maintainers.
This serie prepares the DFU backend for the coming 'stm32prog' command and for STM32CubeProgrammer on stm32mp1 platform.
This STMicroelectronics tool is based on DFU protocol and allows to update all the boot devices and the OTPs on the ST boards (so several DFU target in parallel, including spi nand).
Build result for dfu_v3 branch can be found in
https://travis-ci.org/patrickdelaunay/u-boot/builds/596684593
only one error for sheevaplug, but not reproduced on my side
arm: + sheevaplug
+u-boot.kwb exceeds file size limit:
+ limit: 524288 bytes + actual: 524320 bytes + excess: 32 bytes
$> tools/buildman/buildman sheevaplug
boards.cfg is up to date. Nothing to do.
Building current source for 1 boards (1 thread, 12 jobs per thread)
arm: w+ sheevaplug
+===================== WARNING ====================== +This board does not use CONFIG_DM_MMC. Please update +the board to use CONFIG_DM_MMC before the v2019.04 release. +Failure to update by the deadline may result in board removal. +See doc/driver-model/MIGRATION.txt for more info.
+====================================================
+This board does not use CONFIG_DM_USB. Please update +the board to use CONFIG_DM_USB before the v2019.07 release. +This board does use CONFIG_MVSATA_IDE which is not +ported to driver-model (DM) yet. Please update the storage +controller driver to use CONFIG_AHCI before the v2019.07 +release.
+This board does not use CONFIG_DM_ETH (Driver Model +for Ethernet drivers). Please update the board to use +CONFIG_DM_ETH before the v2020.07 release. Failure to +update by the deadline may result in board removal. +See doc/driver-model/migration.rst for more info.
0 1 0 /1 sheevaplug
Regards
Patrick
Changes in v3:
- Add CONFIG_DFU_SF_PART and solve compilation issue, dependancy with CONFIG_MTDPARTS
- update bad block support in erase loop
- Update loop management for erase
- rebase on v2019.10
- remove previous patch 16/16 pushed by error in v2
http://patchwork.ozlabs.org/patch/1162076/
Changes in v2:
- Add dfu documentation
- Update dfu documentation for callbacks
- Add dfu documentation for several device
- Update commit message
- Update commit message
- Update dfu documentation for MTD
- Update dfu documentation for MTD
- Update dfu documentation for virtual backend
- Update dfu documentation for callbacks
- Update callbacks comment after Lukasz review
- Update after Lukasz Majewski comments
Patrick Delaunay (15):
dfu: cosmetic: cleanup sf to avoid checkpatch error
doc: dfu: Add dfu documentation
dfu: sf: add partition support for nor backend
dfu: prepare the support of multiple interface
dfu: allow to manage DFU on several devices
dfu: allow read with no data without error for EOF indication
dfu: add backend for MTD device
dfu: add partition support for MTD backend
dfu: add DFU virtual backend
dfu: add callback for flush and initiated operation
stm32mp1: activate DFU support and command MTD
stm32mp1: activate SET_DFU_ALT_INFO
stm32mp1: configs: activate CONFIG_MTD_SPI_NAND
stm32mp1: board: add spi nand support
stm32mp1: add support for virtual partition read
board/st/stm32mp1/README | 111 ++++++++++ board/st/stm32mp1/stm32mp1.c | 164 ++++++++++++++- cmd/dfu.c | 21 +- configs/stm32mp15_basic_defconfig | 6 + configs/stm32mp15_optee_defconfig | 6 + configs/stm32mp15_trusted_defconfig | 6 + doc/README.dfu | 270 ++++++++++++++++++++++++ drivers/dfu/Kconfig | 21 ++ drivers/dfu/Makefile | 2 + drivers/dfu/dfu.c | 145 +++++++++++-- drivers/dfu/dfu_mtd.c | 311 ++++++++++++++++++++++++++++ drivers/dfu/dfu_sf.c | 56 ++++- drivers/dfu/dfu_virt.c | 49 +++++ include/configs/stm32mp1.h | 42 +++- include/dfu.h | 71 +++++++ 15 files changed, 1251 insertions(+), 30 deletions(-) create mode 100644 doc/README.dfu create mode 100644 drivers/dfu/dfu_mtd.c create mode 100644 drivers/dfu/dfu_virt.c
Signature · 1 line
2.17.1
PATCH v3 1/15 dfu: cosmetic: cleanup sf to avoid checkpatch error
---
Changes in v3: None
Changes in v2: None
drivers/dfu/dfu.c | 7 ++++--- drivers/dfu/dfu_sf.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/dfu/dfu.c +4 -3
@@ -478,14 +478,15 @@ int dfu_config_entities(char *env, char *interface, char *devstr)const char *dfu_get_dev_type (enum dfu_device_type t) { -const char *dev_t[] = {NULL ,"eMMC" ,"OneNAND" ,"NAND" ,"RAM" ,"SF" }; +const char *const dev_t[] = {NULL ,"eMMC" ,"OneNAND" ,"NAND" ,"RAM" , +"SF" };return dev_t[t]; }const char *dfu_get_layout (enum dfu_layout l) { -const char *dfu_layout[] = {NULL ,"RAW_ADDR" ,"FAT" ,"EXT2" , -"EXT3" ,"EXT4" ,"RAM_ADDR" }; +const char *const dfu_layout[] = {NULL ,"RAW_ADDR" ,"FAT" ,"EXT2" , +"EXT3" ,"EXT4" ,"RAM_ADDR" };return dfu_layout[l]; }
drivers/dfu/dfu_sf.c +2 -2
@@ -19,7 +19,7 @@ static int dfu_get_medium_size_sf(struct dfu_entity *dfu, u64 *size) }static int dfu_read_medium_sf (struct dfu_entity *dfu,u64 offset,void *buf, -long *len) +long *len) {return spi_flash_read (dfu->data.sf.dev, dfu->data.sf.start + offset, *len, buf);
@@ -32,7 +32,7 @@ static u64 find_sector(struct dfu_entity *dfu, u64 start, u64 offset) }static int dfu_write_medium_sf (struct dfu_entity *dfu, -u64 offset,void *buf,long *len) +u64 offset,void *buf,long *len) {int ret;
Signature · 1 line
2.17.1
PATCH v3 2/15 doc: dfu: Add dfu documentation
In reply to Patrick DelaunayAdd documentation for dfu stack and "dfu" command.
---
Changes in v3: None
Changes in v2:
- Add dfu documentation
doc/README.dfu | 144 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 doc/README.dfu
doc/README.dfu new file +144 -0
@@ -0,0 +1,144 @@ +# SPDX-License-Identifier: GPL-2.0+ + +Device Firmware Upgrade (DFU) + +Overview: + + The Device Firmware Upgrade (DFU) allows to download and upload firmware + to/from U-Boot connected over USB. + + U-boot follows the Universal Serial Bus Device Class Specification for + Device Firmware Upgrade Version 1.1 the USB forum (DFU v1.1 in www.usb.org). + + U-Boot implements this DFU capability (CONFIG_DFU) with the command dfu + (cmd/dfu.c / CONFIG_CMD_DFU) based on: + - the DFU stack (common/dfu.c and common/spl/spl_dfu.c), based on the + USB DFU download gadget (drivers/usb/gadget/f_dfu.c) + - The access to mediums is done in DFU backends (driver/dfu) + + Today the supported DFU backends are: + - MMC (RAW or FAT / EXT2 / EXT3 / EXT4 file system) + - NAND + - RAM + - SF (serial flash) + + These DFU backends are also used by + - the dfutftp (see README.dfutftp) + - the thordown command (cmd/thordown.c and gadget/f_thor.c) + +Configuration Options: + CONFIG_DFU + CONFIG_DFU_OVER_USB + CONFIG_DFU_MMC + CONFIG_DFU_NAND + CONFIG_DFU_RAM + CONFIG_DFU_SF + CONFIG_CMD_DFU + +Environment variables: + the dfu command use 3 environments variables: + "dfu_alt_info" : the DFU setting for the USB download gadget with a comma + separated string of information on each alternate: + dfu_alt_info="<alt1>;<alt2>;....;<altN>" + + "dfu_bufsiz" : size of the DFU buffer, when absent, use + CONFIG_SYS_DFU_DATA_BUF_SIZE (8MiB by default) + + "dfu_hash_algo" : name of the hash algorithm to use + +Commands: + dfu <USB_controller> <interface> <dev> list + list the alternate device defined in "dfu_alt_info" + + dfu <USB_controller> <interface> <dev> + start the dfu stack on the USB instance with the selected medium + backend and use the "dfu_alt_info" variable to configure the + alternate setting and link each one with the medium + The dfu command continue until receive a ^C in console or + a DFU detach transaction from HOST. + + The possible values of <interface> are : + (with <USB controller> = 0 in the dfu command example) + + "mmc" (for eMMC and SD card) + cmd: dfu 0 mmc <dev> + each element in "dfu_alt_info" = + <name> raw <offset> <size> raw access to mmc device + <name> part <dev> <part_id> raw acces to partition + <name> fat <dev> <part_id> file in FAT partition + <name> ext4 <dev> <part_id> file in EXT4 partition + + with <partid> is the GPT or DOS partition index + + "nand" (raw slc nand device) + cmd: dfu 0 nand <dev> + each element in "dfu_alt_info" = + <name> raw <offset> <size> raw access to mmc device + <name> part <dev> <part_id> raw acces to partition + <name> partubi <dev> <part_id> raw acces to ubi partition + + with <partid> is the MTD partition index + + "ram" + cmd: dfu 0 ram <dev> + (<dev> is not used for RAM target) + each element in "dfu_alt_info" = + <name> ram <offset> <size> raw access to ram + + "sf" (serial flash : NOR) + cmd: dfu 0 sf <dev> + each element in "dfu_alt_info" = + <name> ram <offset> <size> raw access to sf device + +Host tools: + When U-Boot runs the dfu stack, the DFU host tools can be used + to send/receive firmwares on each configurated alternate. + + For example dfu-util is a host side implementation of the DFU 1.1 + specifications(http://dfu-util.sourceforge.net/) which works with U-Boot. + +Usage: + Example for firmware located in eMMC or SD card, with: + - alternate 1 (alt=1) for SPL partition (GPT partition 1) + - alternate 2 (alt=2) for U-Boot partition (GPT partition 2) + + The U-Boot configuration is: + + U-Boot> env set dfu_alt_info "spl part 0 1;u-boot part 0 2" + + U-Boot> dfu 0 mmc 0 list + DFU alt settings list: + dev: eMMC alt: 0 name: spl layout: RAW_ADDR + dev: eMMC alt: 1 name: u-boot layout: RAW_ADDR + + Boot> dfu 0 mmc 0 + + On the Host side: + + list the available alternate setting: + + $> dfu-util -l + dfu-util 0.9 + + Copyright 2005-2009 Weston Schmidt, Harald Welte and OpenMoko Inc. + Copyright 2010-2016 Tormod Volden and Stefan Schmidt + This program is Free Software and has ABSOLUTELY NO WARRANTY + Please report bugs to http://sourceforge.net/p/dfu-util/tickets/ + + Found DFU: [0483:5720] ver=0200, devnum=45, cfg=1, intf=0, path="3-1.3.1", \ + alt=1, name="u-boot", serial="003A00203438510D36383238" + Found DFU: [0483:5720] ver=0200, devnum=45, cfg=1, intf=0, path="3-1.3.1", \ + alt=0, name="spl", serial="003A00203438510D36383238" + + To download to U-Boot, use -D option + + $> dfu-util -a 0 -D u-boot-spl.bin + $> dfu-util -a 1 -D u-boot.bin + + To upload from U-Boot, use -U option + + $> dfu-util -a 0 -U u-boot-spl.bin + $> dfu-util -a 1 -U u-boot.bin + + To request a DFU detach and reset the USB connection: + $> dfu-util -a 0 -e -R
Signature · 1 line
2.17.1
PATCH v3 3/15 dfu: sf: add partition support for nor backend
In reply to Patrick DelaunayCopy the partition support from NAND backend to SF, support part and partubi option.
In case of ubi partition, erase the rest of the partition as it is mandatory for UBI.
The added code is under compilation flag CONFIG_DFU_SF_PART activated by default.
for example:
U-Boot> env set dfu_alt_info "spl part 0 1;\
u-boot part 0 2;u-boot-env part 0 3;UBI partubi 0 4" U-Boot> dfu 0 sf 0:0:10000000:0
---
Changes in v3:
- Add CONFIG_DFU_SF_PART and solve compilation issue, dependancy with CONFIG_MTDPARTS
Changes in v2:
- Update dfu documentation for callbacks
doc/README.dfu | 5 +++++ drivers/dfu/Kconfig | 8 +++++++ drivers/dfu/dfu_sf.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ include/dfu.h | 2 ++ 4 files changed, 67 insertions(+)
doc/README.dfu +5 -0
@@ -33,6 +33,7 @@ Configuration Options: CONFIG_DFU_NAND CONFIG_DFU_RAM CONFIG_DFU_SF + CONFIG_DFU_SF_PART CONFIG_CMD_DFU Environment variables:
@@ -89,6 +90,10 @@ Commands: cmd: dfu 0 sf <dev> each element in "dfu_alt_info" = <name> ram <offset> <size> raw access to sf device + <name> part <dev> <part_id> raw acces to partition + <name> partubi <dev> <part_id> raw acces to ubi partition + + with <partid> is the MTD partition index Host tools: When U-Boot runs the dfu stack, the DFU host tools can be used
drivers/dfu/Kconfig +8 -0
@@ -46,5 +46,13 @@ config DFU_SF This option enables using DFU to read and write to SPI flash based storage. +config DFU_SF_PART + bool "MTD partition support for SPI flash back end" + depends on DFU_SF && CMD_MTDPARTS + default y + help + This option enables the support of "part" and "partubi" target in + SPI flash DFU back end. + endif endmenu
drivers/dfu/dfu_sf.c +52 -0
75 lines not on this page · raw message
include/dfu.h +2 -0
@@ -77,6 +77,8 @@ struct sf_internal_data {/* RAW programming */ u64 start;u64 size; +/* for sf/ubi use */ +unsigned int ubi; };#define DFU_NAME_SIZE 32
Signature · 1 line
2.17.1
PATCH v3 4/15 dfu: prepare the support of multiple interface
In reply to Patrick DelaunaySplit the function dfu_config_entities with 2 new functions
- dfu_alt_init
- dfu_alt_add
---
Changes in v3: None
Changes in v2: None
drivers/dfu/dfu.c | 51 ++++++++++++++++++++++++++++++++++++----------- include/dfu.h | 2 ++ 2 files changed, 41 insertions(+), 12 deletions(-)
drivers/dfu/dfu.c +39 -12
@@ -439,13 +439,12 @@ void dfu_free_entities(void) alt_num_cnt =0 ; } -int dfu_config_entities (char *env,char *interface,char *devstr) +int dfu_alt_init (int num,struct dfu_entity **dfu) { -struct dfu_entity *dfu; -int i, ret;char *s; +int ret; - dfu_alt_num =dfu_find_alt_num (env); + dfu_alt_num = num;debug ("%s: dfu_alt_num=%d\n" , __func__, dfu_alt_num); dfu_hash_algo =NULL ;
@@ -456,21 +455,49 @@ int dfu_config_entities(char *env, char *interface, char *devstr)pr_err ("Hash algorithm %s not supported\n" , s); } - dfu =calloc (sizeof (*dfu), dfu_alt_num); -if (!dfu) + *dfu =calloc (sizeof (struct dfu_entity ), dfu_alt_num); +if (!*dfu) +return -1 ; + +return 0 ; +} + +int dfu_alt_add (struct dfu_entity *dfu,char *interface,char *devstr,char *s) +{ +struct dfu_entity *p_dfu; +int ret; + +if (alt_num_cnt >= dfu_alt_num) +return -1 ; + + p_dfu = &dfu[alt_num_cnt]; + ret =dfu_fill_entity (p_dfu, s, alt_num_cnt, interface, devstr); +if (ret)return -1 ; -for (i =0 ; i < dfu_alt_num; i++) { +list_add_tail (&p_dfu->list, &dfu_list); + alt_num_cnt++; + +return 0 ; +} + +int dfu_config_entities (char *env,char *interface,char *devstr) +{ +struct dfu_entity *dfu; +int i, ret; +char *s; + + ret =dfu_alt_init (dfu_find_alt_num (env), &dfu); +if (ret) +return -1 ; + +for (i =0 ; i < dfu_alt_num; i++) { s =strsep (&env,";" ); - ret =dfu_fill_entity (&dfu[i], s, alt_num_cnt, interface, - devstr); + ret =dfu_alt_add (dfu, interface, devstr, s);if (ret) {/* We will free "dfu" in dfu_free_entities() */ return -1 ; } - -list_add_tail (&dfu[i].list, &dfu_list); - alt_num_cnt++; }return 0 ;
include/dfu.h +2 -0
@@ -143,6 +143,8 @@ struct dfu_entity {#ifdef CONFIG_SET_DFU_ALT_INFO void set_dfu_alt_info (char *interface,char *devstr);#endif +int dfu_alt_init (int num,struct dfu_entity **dfu); +int dfu_alt_add (struct dfu_entity *dfu,char *interface,char *devstr,char *s);int dfu_config_entities (char *s,char *interface,char *devstr);void dfu_free_entities (void );void dfu_show_entities (void );
Signature · 1 line
2.17.1
PATCH v3 5/15 dfu: allow to manage DFU on several devices
In reply to Patrick DelaunayAdd support of DFU for several interface/device with one command.
The format for "dfu_alt_info" in this case is :
- <interface> <dev>'='alternate list (';' separated)
- each interface is separated by '&'
The previous behavior is always supported.
One example for NOR (bootloaders) + NAND (rootfs in UBI):
U-Boot> env set dfu_alt_info \
"sf 0:0:10000000:0=spl part 0 1;u-boot part 0 2; \
u-boot-env part 0 3&nand 0=UBI partubi 0,3"
U-Boot> dfu 0 list
DFU alt settings list:
dev: SF alt: 0 name: spl layout: RAW_ADDR
dev: SF alt: 1 name: ssbl layout: RAW_ADDR
dev: SF alt: 2 name: u-boot-env layout: RAW_ADDR
dev: NAND alt: 3 name: UBI layout: RAW_ADDR
U-Boot> dfu 0
$> dfu-util -l
Found DFU: [0483:5720] ver=9999, devnum=96, cfg=1,\
intf=0, alt=3, name="UBI", serial="002700333338511934383330"
Found DFU: [0483:5720] ver=9999, devnum=96, cfg=1,\
intf=0, alt=2, name="u-boot-env", serial="002700333338511934383330"
Found DFU: [0483:5720] ver=9999, devnum=96, cfg=1,\
intf=0, alt=1, name="u-boot", serial="002700333338511934383330"
Found DFU: [0483:5720] ver=9999, devnum=96, cfg=1,\
intf=0, alt=0, name="spl", serial="002700333338511934383330"
---
Changes in v3: None
Changes in v2:
- Add dfu documentation for several device
cmd/dfu.c | 21 ++++++++++------- doc/README.dfu | 58 ++++++++++++++++++++++++++++++++++++++++++--- drivers/dfu/dfu.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 127 insertions(+), 12 deletions(-)
cmd/dfu.c +13 -8
@@ -21,23 +21,28 @@static int do_dfu (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) { -if (argc <4 ) +if (argc <2 )return CMD_RET_USAGE ;#ifdef CONFIG_DFU_OVER_USB char *usb_controller = argv[1 ];#endif #if defined(CONFIG_DFU_OVER_USB ) || defined(CONFIG_DFU_OVER_TFTP ) -char *interface = argv[2 ]; -char *devstring = argv[3 ]; +char *interface =NULL ; +char *devstring =NULL ; + +if (argc >=4 ) { + interface = argv[2 ]; + devstring = argv[3 ]; + }#endif int ret =0 ;#ifdef CONFIG_DFU_OVER_TFTP unsigned long addr =0 ;if (!strcmp (argv[1 ],"tftp" )) { -if (argc ==5 ) - addr =simple_strtoul (argv[4 ],NULL ,0 ); +if (argc ==5 || argc ==3 ) + addr =simple_strtoul (argv[argc -1 ],NULL ,0 );return update_tftp (addr, interface, devstring); }
@@ -48,7 +53,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) goto done; ret =CMD_RET_SUCCESS ; -if (argc >4 &&strcmp (argv[4 ],"list" ) ==0 ) { +if (strcmp (argv[argc -1 ],"list" ) ==0 ) {dfu_show_entities (); goto done; }
@@ -67,7 +72,7 @@ U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,"Device Firmware Upgrade" ,"" #ifdef CONFIG_DFU_OVER_USB -"<USB_controller> <interface> <dev> [list]\n" +"<USB_controller> [<interface> <dev>] [list]\n" " - device firmware upgrade via <USB_controller>\n" " on device <dev>, attached to interface\n" " <interface>\n"
@@ -77,7 +82,7 @@ U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,#ifdef CONFIG_DFU_OVER_USB "dfu "#endif -"tftp <interface> <dev> [<addr>]\n" +"tftp [<interface> <dev>] [<addr>]\n" " - device firmware upgrade via TFTP\n" " on device <dev>, attached to interface\n" " <interface>\n"
doc/README.dfu +55 -3
87 lines not on this page · raw message
drivers/dfu/dfu.c +59 -1
90 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v3 6/15 dfu: allow read with no data without error for EOF indication
In reply to Patrick DelaunayThis patch allows the DFU backend to indicate that that it can't provide no more data to fill the DFU buffer, by setting b_left =0 without error, even if the size of received data is lower of the expected total size indicated by get_medium_size.
For USB DFU stack point of view, it is acceptable:
the read length < requested size in DFU_UPLOAD and the transaction is stopped.
That avoid infinite loop issue in dfu_read_buffer_fill because the size for the DFU read is limited by get_medium_size = r_left and the DFU stack expects that read is allowed up to this size.
This issue never occurs for current flash device (where chunk are always completely read, and b_left will be never 0) but it is useful for virtual partition when the backend only know the max size of this alternate, the real size of the data are only known in the read treatment.
PS: for file access on mmc, EOF is never reached as
dfu_get_medium_size_mmc returns the exact size of the file.
---
Changes in v3: None
Changes in v2:
- Update commit message
drivers/dfu/dfu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/dfu/dfu.c +2 -0
@@ -396,6 +396,8 @@ static int dfu_read_buffer_fill(struct dfu_entity *dfu, void *buf, int size)debug ("%s: Read error!\n" , __func__);return ret; } +if (dfu->b_left ==0 ) +break ; dfu->offset += dfu->b_left; dfu->r_left -= dfu->b_left;
Signature · 1 line
2.17.1
PATCH v3 7/15 dfu: add backend for MTD device
In reply to Patrick DelaunayAdd DFU backend for MTD device: allow to read
and write on all MTD device (NAND, SPI-NOR,
SPI-NAND,...)
For example :
Quoted 2 lines
set
dfu_alt_info"nand_rawraw0x00x100000"
dfu 0 mtd nand0
This MTD backend provides the same level than dfu nand backend for NAND and dfu sf backend for SPI-NOR; So it can replace booth of them but it also add support of spi-nand.
Quoted 2 lines
set
dfu_alt_info"nand_rawraw0x00x100000"
dfu 0 mtd spi-nand0
The backend code is based on the "mtd" command introduced by commit 5db66b3aee6f ("cmd: mtd:
add 'mtd' command")
---
Changes in v3:
- update bad block support in erase loop
Changes in v2:
- Update commit message
- Update dfu documentation for MTD
doc/README.dfu | 10 ++ drivers/dfu/Kconfig | 6 ++ drivers/dfu/Makefile | 1 + drivers/dfu/dfu.c | 5 +- drivers/dfu/dfu_mtd.c | 232 ++++++++++++++++++++++++++++++++++++++++++ include/dfu.h | 21 ++++ 6 files changed, 274 insertions(+), 1 deletion(-) create mode 100644 drivers/dfu/dfu_mtd.c
doc/README.dfu +10 -0
@@ -21,6 +21,7 @@ Overview: - NAND - RAM - SF (serial flash) + - MTD (all MTD device: NAND, SPI-NOR, SPI-NAND,...) These DFU backends are also used by - the dfutftp (see README.dfutftp)
@@ -30,6 +31,7 @@ Configuration Options: CONFIG_DFU CONFIG_DFU_OVER_USB CONFIG_DFU_MMC + CONFIG_DFU_MTD CONFIG_DFU_NAND CONFIG_DFU_RAM CONFIG_DFU_SF
@@ -104,6 +106,13 @@ Commands: with <partid> is the MTD partition index + "mtd" (all MTD device: NAND, SPI-NOR, SPI-NAND,...) + cmd: dfu 0 mtd <dev> + with <dev> the mtd identifier as defined in mtd command + (nand0, nor0, spi-nand0,...) + each element in "dfu_alt_info" = + <name> raw <offset> <size> raw access to mtd device + <interface> and <dev> are absent: the dfu command to use multiple devices cmd: dfu 0 list
@@ -114,6 +123,7 @@ Commands: nand <dev>=<alt1>;....;<altN> ram <dev>=<alt1>;....;<altN> sf <dev>=<alt1>;....;<altN> + mtd <dev>=<alt1>;....;<altN> Host tools:
drivers/dfu/Kconfig +6 -0
@@ -54,5 +54,11 @@ config DFU_SF_PART This option enables the support of "part" and "partubi" target in SPI flash DFU back end. +config DFU_MTD + bool "MTD back end for DFU" + depends on MTD + help + This option enables using DFU to read and write to on any MTD device. + endif endmenu
drivers/dfu/Makefile +1 -0
@@ -5,6 +5,7 @@ obj-$(CONFIG_$(SPL_)DFU) += dfu.o obj-$(CONFIG_$(SPL_)DFU_MMC) += dfu_mmc.o +obj-$(CONFIG_$(SPL_)DFU_MTD) += dfu_mtd.o obj-$(CONFIG_$(SPL_)DFU_NAND) += dfu_nand.o obj-$(CONFIG_$(SPL_)DFU_RAM) += dfu_ram.o obj-$(CONFIG_$(SPL_)DFU_SF) += dfu_sf.o
drivers/dfu/dfu.c +4 -1
@@ -462,6 +462,9 @@ static int dfu_fill_entity(struct dfu_entity *dfu, char *s, int alt,if (strcmp (interface,"mmc" ) ==0 ) {if (dfu_fill_entity_mmc (dfu, devstr, s))return -1 ; + }else if (strcmp (interface,"mtd" ) ==0 ) { +if (dfu_fill_entity_mtd (dfu, devstr, s)) +return -1 ; }else if (strcmp (interface,"nand" ) ==0 ) {if (dfu_fill_entity_nand (dfu, devstr, s))return -1 ;
@@ -566,7 +569,7 @@ int dfu_config_entities(char *env, char *interface, char *devstr)const char *dfu_get_dev_type (enum dfu_device_type t) {const char *const dev_t[] = {NULL ,"eMMC" ,"OneNAND" ,"NAND" ,"RAM" , -"SF" }; +"SF" ,"MTD" };return dev_t[t]; }
drivers/dfu/dfu_mtd.c new file +232 -0
232 lines not on this page · raw message
include/dfu.h +21 -0
@@ -22,6 +22,7 @@ enum dfu_device_type {DFU_DEV_NAND ,DFU_DEV_RAM ,DFU_DEV_SF , + DFU_DEV_MTD, }; enum dfu_layout {
@@ -55,6 +56,14 @@ struct mmc_internal_data {unsigned int part; }; +struct mtd_internal_data { +struct mtd_info *info; + +/* RAW programming */ +u64 start; +u64 size; +}; +struct nand_internal_data {/* RAW programming */ u64 start;
@@ -105,6 +114,7 @@ struct dfu_entity {union {struct mmc_internal_data mmc; +struct mtd_internal_data mtd;struct nand_internal_data nand;struct ram_internal_data ram;struct sf_internal_data sf;
@@ -249,6 +259,17 @@ static inline int dfu_fill_entity_sf(struct dfu_entity *dfu, char *devstr, }#endif +#if CONFIG_IS_ENABLED (DFU_MTD ) +int dfu_fill_entity_mtd (struct dfu_entity *dfu,char *devstr,char *s); +#else +static inline int dfu_fill_entity_mtd (struct dfu_entity *dfu,char *devstr, +char *s) +{ +puts ("MTD support not available!\n" ); +return -1 ; +} +#endif +/** * dfu_tftp_write - Write TFTP data to DFU medium *
Signature · 1 line
2.17.1
PATCH v3 8/15 dfu: add partition support for MTD backend
In reply to Patrick DelaunayAdd the support of MTD partition for the MTD backend.
The expected dfu_alt_info for one alternate on the mtd device :
<name> part <part_id>
<name> partubi <part_id>
"partubi" also erase up to the end of the partition after write operation.
For example: dfu_alt_info = "spl part 1;u-boot part 2; UBI partubi 3"
U-Boot> dfu 0 mtd nand0
---
Changes in v3:
- Update loop management for erase
Changes in v2:
- Update dfu documentation for MTD
doc/README.dfu | 21 +++++++++++ drivers/dfu/dfu_mtd.c | 81 ++++++++++++++++++++++++++++++++++++++++++- include/dfu.h | 2 ++ 3 files changed, 103 insertions(+), 1 deletion(-)
doc/README.dfu +21 -0
@@ -112,6 +112,10 @@ Commands: (nand0, nor0, spi-nand0,...) each element in "dfu_alt_info" = <name> raw <offset> <size> raw access to mtd device + <name> part <dev> <part_id> raw acces to partition + <name> partubi <dev> <part_id> raw acces to ubi partition + + with <partid> is the MTD partition index <interface> and <dev> are absent: the dfu command to use multiple devices
@@ -209,3 +213,20 @@ Usage: intf=0, alt=1, name="u-boot", serial="002700333338511934383330" Found DFU: [0483:5720] ver=9999, devnum=96, cfg=1,\ intf=0, alt=0, name="spl", serial="002700333338511934383330" + + Same example with MTD backend + + U-Boot> env set dfu_alt_info \ + "mtd nor0=spl part 1;u-boot part 2;u-boot-env part 3&"\ + "mtd nand0=UBI partubi 1" + + U-Boot> dfu 0 list + using id 'nor0,0' + using id 'nor0,1' + using id 'nor0,2' + using id 'nand0,0' + DFU alt settings list: + dev: MTD alt: 0 name: spl layout: RAW_ADDR + dev: MTD alt: 1 name: u-boot layout: RAW_ADDR + dev: MTD alt: 2 name: u-boot-env layout: RAW_ADDR + dev: MTD alt: 3 name: UBI layout: RAW_ADDR
drivers/dfu/dfu_mtd.c +80 -1
114 lines not on this page · raw message
include/dfu.h +2 -0
@@ -62,6 +62,8 @@ struct mtd_internal_data {/* RAW programming */ u64 start;u64 size; +/* for ubi partition */ +unsigned int ubi; };struct nand_internal_data {
Signature · 1 line
2.17.1
PATCH v3 9/15 dfu: add DFU virtual backend
In reply to Patrick DelaunayAdd a virtual DFU backend to allow board specific read and write (for OTP update for example).
---
Changes in v3: None
Changes in v2:
- Update dfu documentation for virtual backend
doc/README.dfu | 32 ++++++++++++++++++++++++++- drivers/dfu/Kconfig | 7 ++++++ drivers/dfu/Makefile | 1 + drivers/dfu/dfu.c | 5 ++++- drivers/dfu/dfu_virt.c | 49 ++++++++++++++++++++++++++++++++++++++++++ include/dfu.h | 22 +++++++++++++++++++ 6 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 drivers/dfu/dfu_virt.c
doc/README.dfu +31 -1
@@ -22,11 +22,18 @@ Overview: - RAM - SF (serial flash) - MTD (all MTD device: NAND, SPI-NOR, SPI-NAND,...) + - virtual These DFU backends are also used by - the dfutftp (see README.dfutftp) - the thordown command (cmd/thordown.c and gadget/f_thor.c) + The "virtual" backend is a generic DFU backend to support a board specific + target (for example OTP), only based on the weak functions: + - dfu_write_medium_virt + - dfu_get_medium_size_virt + - dfu_read_medium_virt + Configuration Options: CONFIG_DFU CONFIG_DFU_OVER_USB
@@ -36,6 +43,7 @@ Configuration Options: CONFIG_DFU_RAM CONFIG_DFU_SF CONFIG_DFU_SF_PART + CONFIG_DFU_VIRTUAL CONFIG_CMD_DFU Environment variables:
@@ -117,6 +125,11 @@ Commands: with <partid> is the MTD partition index + "virt" + cmd: dfu 0 virt <dev> + each element in "dfu_alt_info" = + <name> + <interface> and <dev> are absent: the dfu command to use multiple devices cmd: dfu 0 list
@@ -128,7 +141,7 @@ Commands: ram <dev>=<alt1>;....;<altN> sf <dev>=<alt1>;....;<altN> mtd <dev>=<alt1>;....;<altN> - + virt <dev>=<alt1>;....;<altN> Host tools: When U-Boot runs the dfu stack, the DFU host tools can be used
@@ -230,3 +243,20 @@ Usage: dev: MTD alt: 1 name: u-boot layout: RAW_ADDR dev: MTD alt: 2 name: u-boot-env layout: RAW_ADDR dev: MTD alt: 3 name: UBI layout: RAW_ADDR + + Example 3: firmware located in SD Card (mmc) and virtual partition on + OTP and PMIC not volatile memory + - alternate 1 (alt=1) for scard + - alternate 2 (alt=2) for OTP (virtual) + - alternate 3 (alt=3) for PMIC NVM (virtual) + + U-Boot> env set dfu_alt_info \ + "mmc 0=sdcard raw 0 0x100000&"\ + "virt 0=otp" \ + "virt 1=pmic" + + U-Boot> dfu 0 list + DFU alt settings list: + dev: eMMC alt: 0 name: sdcard layout: RAW_ADDR + dev: VIRT alt: 1 name: otp layout: RAW_ADDR + dev: VIRT alt: 2 name: pmic layout: RAW_ADDR
drivers/dfu/Kconfig +7 -0
@@ -60,5 +60,12 @@ config DFU_MTD help This option enables using DFU to read and write to on any MTD device. +config DFU_VIRT + bool "VIRTUAL flash back end for DFU" + help + This option enables using DFU to read and write to VIRTUAL device + used at board level to manage specific behavior + (OTP update for example). + endif endmenu
drivers/dfu/Makefile +1 -0
@@ -10,3 +10,4 @@ obj-$(CONFIG_$(SPL_)DFU_NAND) += dfu_nand.o obj-$(CONFIG_$(SPL_)DFU_RAM) += dfu_ram.o obj-$(CONFIG_$(SPL_)DFU_SF) += dfu_sf.o obj-$(CONFIG_$(SPL_)DFU_TFTP) += dfu_tftp.o +obj-$(CONFIG_$(SPL_)DFU_VIRT) += dfu_virt.o
drivers/dfu/dfu.c +4 -1
@@ -474,6 +474,9 @@ static int dfu_fill_entity(struct dfu_entity *dfu, char *s, int alt, }else if (strcmp (interface,"sf" ) ==0 ) {if (dfu_fill_entity_sf (dfu, devstr, s))return -1 ; + }else if (strcmp (interface,"virt" ) ==0 ) { +if (dfu_fill_entity_virt (dfu, devstr, s)) +return -1 ; }else {printf ("%s: Device %s not (yet) supported!\n" , __func__, interface);
@@ -569,7 +572,7 @@ int dfu_config_entities(char *env, char *interface, char *devstr)const char *dfu_get_dev_type (enum dfu_device_type t) {const char *const dev_t[] = {NULL ,"eMMC" ,"OneNAND" ,"NAND" ,"RAM" , -"SF" ,"MTD" }; +"SF" ,"MTD" ,"VIRT" };return dev_t[t]; }
drivers/dfu/dfu_virt.c new file +49 -0
49 lines not on this page · raw message
include/dfu.h +22 -0
@@ -23,6 +23,7 @@ enum dfu_device_type {DFU_DEV_RAM ,DFU_DEV_SF ,DFU_DEV_MTD , + DFU_DEV_VIRT, }; enum dfu_layout {
@@ -92,6 +93,10 @@ struct sf_internal_data {unsigned int ubi; }; +struct virt_internal_data { +int dev_num; +}; +#define DFU_NAME_SIZE 32#ifndef CONFIG_SYS_DFU_DATA_BUF_SIZE #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1024*1024*8)/* 8 MiB */
@@ -120,6 +125,7 @@ struct dfu_entity {struct nand_internal_data nand;struct ram_internal_data ram;struct sf_internal_data sf; +struct virt_internal_data virt; } data;int (*get_medium_size)(struct dfu_entity *dfu,u64 *size);
@@ -272,6 +278,22 @@ static inline int dfu_fill_entity_mtd(struct dfu_entity *dfu, char *devstr, }#endif +#ifdef CONFIG_DFU_VIRT +int dfu_fill_entity_virt (struct dfu_entity *dfu,char *devstr,char *s); +int dfu_write_medium_virt (struct dfu_entity *dfu,u64 offset, +void *buf,long *len); +int dfu_get_medium_size_virt (struct dfu_entity *dfu,u64 *size); +int dfu_read_medium_virt (struct dfu_entity *dfu,u64 offset, +void *buf,long *len); +#else +static inline int dfu_fill_entity_virt (struct dfu_entity *dfu,char *devstr, +char *s) +{ +puts ("VIRT support not available!\n" ); +return -1 ; +} +#endif +/** * dfu_tftp_write - Write TFTP data to DFU medium *
Signature · 1 line
2.17.1
PATCH v3 10/15 dfu: add callback for flush and initiated operation
In reply to Patrick DelaunayAdd weak callback to allow board specific behavior
- flush
- initiated
This patch prepare usage of DFU back end for communication with STM32CubeProgrammer on stm32mp1 platform with stm32prog command.
---
Changes in v3: None
Changes in v2:
- Update dfu documentation for callbacks
- Update callbacks comment after Lukasz review
doc/README.dfu | 8 ++++++++ drivers/dfu/dfu.c | 19 +++++++++++++++++++ include/dfu.h | 22 ++++++++++++++++++++++ 3 files changed, 49 insertions(+)
doc/README.dfu +8 -0
@@ -143,6 +143,14 @@ Commands: mtd <dev>=<alt1>;....;<altN> virt <dev>=<alt1>;....;<altN> +Callbacks: + The weak callback functions can be implemented to manage specific behavior + - dfu_initiated_callback : called when the DFU transaction is started, + used to initiase the device + - dfu_flush_callback : called at the end of the DFU write after DFU + manifestation, used to manage the device when + DFU transaction is closed + Host tools: When U-Boot runs the dfu stack, the DFU host tools can be used to send/receive firmwares on each configurated alternate.
drivers/dfu/dfu.c +19 -0
@@ -22,6 +22,22 @@ static int dfu_alt_num;static int alt_num_cnt;static struct hash_algo *dfu_hash_algo; +/* +* The purpose of the dfu_flush_callback() function is to +* provide callback for dfu user +*/ +__weak void dfu_flush_callback (struct dfu_entity *dfu) +{ +} + +/* +* The purpose of the dfu_initiated_callback() function is to +* provide callback for dfu user +*/ +__weak void dfu_initiated_callback (struct dfu_entity *dfu) +{ +} +/* * The purpose of the dfu_usb_get_reset() function is to * provide information if after USB_DETACH request
@@ -263,6 +279,7 @@ int dfu_transaction_initiate(struct dfu_entity *dfu, bool read) } dfu->inited =1 ; +dfu_initiated_callback (dfu);return 0 ; }
@@ -282,6 +299,8 @@ int dfu_flush(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)printf ("\nDFU complete %s: 0x%08x\n" , dfu_hash_algo->name, dfu->crc); +dfu_flush_callback (dfu); +dfu_transaction_cleanup (dfu);return ret;
include/dfu.h +22 -0
@@ -183,6 +183,28 @@ int dfu_read(struct dfu_entity *de, void *buf, int size, int blk_seq_num);int dfu_write (struct dfu_entity *de,void *buf,int size,int blk_seq_num);int dfu_flush (struct dfu_entity *de,void *buf,int size,int blk_seq_num); +/** +* dfu_initiated_callback - weak callback called on DFU transaction start +* +* It is a callback function called by DFU stack when a DFU transaction is +* initiated. This function allows to manage some board specific behavior on +* DFU targets. +* +* @param dfu - pointer to the dfu_entity, which should be initialized +* +*/ +void dfu_initiated_callback (struct dfu_entity *dfu); +/** +* dfu_flush_callback - weak callback called at the end of the DFU write +* +* It is a callback function called by DFU stack after DFU manifestation. +* This function allows to manage some board specific behavior on DFU targets +* +* @param dfu - pointer to the dfu_entity, which should be flushed +* +*/ +void dfu_flush_callback (struct dfu_entity *dfu); +/* * dfu_defer_flush - pointer to store dfu_entity for deferred flashing. * It should be NULL when not used.
Signature · 1 line
2.17.1
PATCH v3 11/15 stm32mp1: activate DFU support and command MTD
In reply to Patrick DelaunayAdd support of DFU for MMC, MTD, RAM and MTD command.
---
Changes in v3: None
Changes in v2: None
configs/stm32mp15_basic_defconfig | 4 ++++ configs/stm32mp15_optee_defconfig | 4 ++++ configs/stm32mp15_trusted_defconfig | 4 ++++ 3 files changed, 12 insertions(+)
configs/stm32mp15_basic_defconfig +4 -0
@@ -34,6 +34,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y
@@ -62,6 +63,9 @@ CONFIG_ENV_UBI_PART="UBI" CONFIG_ENV_UBI_VOLUME="uboot_config" CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r" CONFIG_STM32_ADC=y +CONFIG_DFU_MMC=y +CONFIG_DFU_RAM=y +CONFIG_DFU_MTD=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000
configs/stm32mp15_optee_defconfig +4 -0
@@ -23,6 +23,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y
@@ -49,6 +50,9 @@ CONFIG_ENV_UBI_PART="UBI" CONFIG_ENV_UBI_VOLUME="uboot_config" CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r" CONFIG_STM32_ADC=y +CONFIG_DFU_MMC=y +CONFIG_DFU_RAM=y +CONFIG_DFU_MTD=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000
configs/stm32mp15_trusted_defconfig +4 -0
@@ -22,6 +22,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y
@@ -48,6 +49,9 @@ CONFIG_ENV_UBI_PART="UBI" CONFIG_ENV_UBI_VOLUME="uboot_config" CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r" CONFIG_STM32_ADC=y +CONFIG_DFU_MMC=y +CONFIG_DFU_RAM=y +CONFIG_DFU_MTD=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000
Signature · 1 line
2.17.1
PATCH v3 11/15 stm32mp1: activate DFU support and command MTD
Hi Patrick
Quoted 70 lines · Patrick Delaunay
Add support of DFU for MMC, MTD, RAM and MTD command.
Signed-off-by Patrick Delaunay <[email protected]>---
Changes in v3: None
Changes in v2: Noneconfigs/stm32mp15_basic_defconfig | 4 ++++ configs/stm32mp15_optee_defconfig | 4 ++++ configs/stm32mp15_trusted_defconfig | 4 ++++ 3 files changed, 12 insertions(+)configs/stm32mp15_basic_defconfig +4
-0@@ -34,6 +34,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y@@ -62,6 +63,9 @@ CONFIG_ENV_UBI_PART="UBI" CONFIG_ENV_UBI_VOLUME="uboot_config" CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r" CONFIG_STM32_ADC=y +CONFIG_DFU_MMC=y +CONFIG_DFU_RAM=y +CONFIG_DFU_MTD=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000configs/stm32mp15_optee_defconfig +4
-0@@ -23,6 +23,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y@@ -49,6 +50,9 @@ CONFIG_ENV_UBI_PART="UBI" CONFIG_ENV_UBI_VOLUME="uboot_config" CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r" CONFIG_STM32_ADC=y +CONFIG_DFU_MMC=y +CONFIG_DFU_RAM=y +CONFIG_DFU_MTD=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000configs/stm32mp15_trusted_defconfig +1
-0@@ -22,6 +22,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y
configs/stm32mp15_trusted_defconfig CONFIG_ENV_UBI_PART="UBI" · line 57
Quoted 9 lines
configs/stm32mp15_trusted_defconfig +3
-0@@ -48,6 +49,9 @@ CONFIG_ENV_UBI_PART="UBI" CONFIG_ENV_UBI_VOLUME="uboot_config" CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r" CONFIG_STM32_ADC=y +CONFIG_DFU_MMC=y +CONFIG_DFU_RAM=y +CONFIG_DFU_MTD=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000
Thanks
PATCH v3 11/15 stm32mp1: activate DFU support and command MTD
In reply to Patrick DelaunayHi,
Quoted 7 lines
From: Patrick DELAUNAY <[email protected]>
Sent: lundi 14 octobre 2019 09:28Add support of DFU for MMC, MTD, RAM and MTD command.
Signed-off-by Patrick Delaunay <[email protected]>---
Applied to u-boot-stm32/master, thanks!
Signature · 1 line
Patrick
PATCH v3 12/15 stm32mp1: activate SET_DFU_ALT_INFO
In reply to Patrick DelaunayGenerate automatically dfu_alt_info for the supported device. The simple command "dfu 0" allows to start the dfu stack on usb 0 for the supported devices:
- dfu mtd for nand0
- dfu mtd for nor0
- dfu mmc for SDCard
- dfu mmc for eMMC
- dfu ram for images in DDR
The DUF alternate use the "part", "partubi" and "mmcpart" options to select the correct MTD or GPT partition or the eMMC hw boot partition.
---
Changes in v3: None
Changes in v2: None
board/st/stm32mp1/README | 111 +++++++++++++++++++++++++++++++++++ board/st/stm32mp1/stm32mp1.c | 51 ++++++++++++++++ include/configs/stm32mp1.h | 32 ++++++++++ 3 files changed, 194 insertions(+)
board/st/stm32mp1/README +111 -0
@@ -390,3 +390,114 @@ B/ Automatically by using FIT feature and generic DISTRO bootcmd the correct configuration => stm32mp157c-ev1-m4 => stm32mp157c-dk2-m4 + +11. DFU support +=============== + +The DFU is supported on ST board. +The env variable dfu_alt_info is automatically build, and all +the memory present on the ST boards are exported. + +The mode is started by + +STM32MP> dfu 0 + +On EV1 board: + +STM32MP> dfu 0 list + +DFU alt settings list: +dev: RAM alt: 0 name: uImage layout: RAM_ADDR +dev: RAM alt: 1 name: devicetree.dtb layout: RAM_ADDR +dev: RAM alt: 2 name: uramdisk.image.gz layout: RAM_ADDR +dev: eMMC alt: 3 name: sdcard_fsbl1 layout: RAW_ADDR +dev: eMMC alt: 4 name: sdcard_fsbl2 layout: RAW_ADDR +dev: eMMC alt: 5 name: sdcard_ssbl layout: RAW_ADDR +dev: eMMC alt: 6 name: sdcard_bootfs layout: RAW_ADDR +dev: eMMC alt: 7 name: sdcard_vendorfs layout: RAW_ADDR +dev: eMMC alt: 8 name: sdcard_rootfs layout: RAW_ADDR +dev: eMMC alt: 9 name: sdcard_userfs layout: RAW_ADDR +dev: eMMC alt: 10 name: emmc_fsbl1 layout: RAW_ADDR +dev: eMMC alt: 11 name: emmc_fsbl2 layout: RAW_ADDR +dev: eMMC alt: 12 name: emmc_ssbl layout: RAW_ADDR +dev: eMMC alt: 13 name: emmc_bootfs layout: RAW_ADDR +dev: eMMC alt: 14 name: emmc_vendorfs layout: RAW_ADDR +dev: eMMC alt: 15 name: emmc_rootfs layout: RAW_ADDR +dev: eMMC alt: 16 name: emmc_userfs layout: RAW_ADDR +dev: MTD alt: 17 name: nor_fsbl1 layout: RAW_ADDR +dev: MTD alt: 18 name: nor_fsbl2 layout: RAW_ADDR +dev: MTD alt: 19 name: nor_ssbl layout: RAW_ADDR +dev: MTD alt: 20 name: nor_env layout: RAW_ADDR +dev: MTD alt: 21 name: nand_fsbl layout: RAW_ADDR +dev: MTD alt: 22 name: nand_ssbl1 layout: RAW_ADDR +dev: MTD alt: 23 name: nand_ssbl2 layout: RAW_ADDR +dev: MTD alt: 24 name: nand_UBI layout: RAW_ADDR +dev: VIRT alt: 25 name: OTP layout: RAW_ADDR +dev: VIRT alt: 26 name: PMIC layout: RAW_ADDR + +All the supported device are exported for dfu-util tool: + +$> dfu-util -l +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=26, name="PMIC", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=25, name="OTP", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=24, name="nand_UBI", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=23, name="nand_ssbl2", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=22, name="nand_ssbl1", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=21, name="nand_fsbl", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=20, name="nor_env", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=19, name="nor_ssbl", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=18, name="nor_fsbl2", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=17, name="nor_fsbl1", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=16, name="emmc_userfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=15, name="emmc_rootfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=14, name="emmc_vendorfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=13, name="emmc_bootfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=12, name="emmc_ssbl", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=11, name="emmc_fsbl2", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=10, name="emmc_fsbl1", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=9, name="sdcard_userfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=8, name="sdcard_rootfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=7, name="sdcard_vendorfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=6, name="sdcard_bootfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=5, name="sdcard_ssbl", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=4, name="sdcard_fsbl2", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=3, name="sdcard_fsbl1", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=2, name="uramdisk.image.gz", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=1, name="devicetree.dtb", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=0, name="uImage", serial="002700333338511934383330" + +You can update the boot device: + +#SDCARD +$> dfu-util -d 0483:5720 -a 3 -D tf-a-stm32mp157c-ev1-trusted.stm32 +$> dfu-util -d 0483:5720 -a 4 -D tf-a-stm32mp157c-ev1-trusted.stm32 +$> dfu-util -d 0483:5720 -a 5 -D u-boot-stm32mp157c-ev1-trusted.img +$> dfu-util -d 0483:5720 -a 6 -D st-image-bootfs-openstlinux-weston-stm32mp1.ext4 +$> dfu-util -d 0483:5720 -a 7 -D st-image-vendorfs-openstlinux-weston-stm32mp1.ext4 +$> dfu-util -d 0483:5720 -a 8 -D st-image-weston-openstlinux-weston-stm32mp1.ext4 +$> dfu-util -d 0483:5720 -a 9 -D st-image-userfs-openstlinux-weston-stm32mp1.ext4 + +#EMMC +$> dfu-util -d 0483:5720 -a 10 -D tf-a-stm32mp157c-ev1-trusted.stm32 +$> dfu-util -d 0483:5720 -a 11 -D tf-a-stm32mp157c-ev1-trusted.stm32 +$> dfu-util -d 0483:5720 -a 12 -D u-boot-stm32mp157c-ev1-trusted.img +$> dfu-util -d 0483:5720 -a 13 -D st-image-bootfs-openstlinux-weston-stm32mp1.ext4 +$> dfu-util -d 0483:5720 -a 14 -D st-image-vendorfs-openstlinux-weston-stm32mp1.ext4 +$> dfu-util -d 0483:5720 -a 15 -D st-image-weston-openstlinux-weston-stm32mp1.ext4 +$> dfu-util -d 0483:5720 -a 16 -D st-image-userfs-openstlinux-weston-stm32mp1.ext4 + +#NOR +$> dfu-util -d 0483:5720 -a 17 -D tf-a-stm32mp157c-ev1-trusted.stm32 +$> dfu-util -d 0483:5720 -a 18 -D tf-a-stm32mp157c-ev1-trusted.stm32 +$> dfu-util -d 0483:5720 -a 19 -D u-boot-stm32mp157c-ev1-trusted.img + +#NAND (UBI partition used for NAND only boot or NOR + NAND boot) +$> dfu-util -d 0483:5720 -a 21 -D tf-a-stm32mp157c-ev1-trusted.stm32 +$> dfu-util -d 0483:5720 -a 22 -D u-boot-stm32mp157c-ev1-trusted.img +$> dfu-util -d 0483:5720 -a 23 -D u-boot-stm32mp157c-ev1-trusted.img +$> dfu-util -d 0483:5720 -a 24 -D st-image-weston-openstlinux-weston-stm32mp1_nand_4_256_multivolume.ubi + +And you can also dump the OTP and the PMIC NVM with: + +$> dfu-util -d 0483:5720 -a 25 -U otp.bin +$> dfu-util -d 0483:5720 -a 26 -U pmic.bin
board/st/stm32mp1/stm32mp1.c +51 -0
63 lines not on this page · raw message
include/configs/stm32mp1.h +32 -0
@@ -83,6 +83,8 @@#define CONFIG_SYS_MTDPARTS_RUNTIME #endif +#define CONFIG_SET_DFU_ALT_INFO +/*****************************************************************************/ #ifdef CONFIG_DISTRO_DEFAULTS /*****************************************************************************/
@@ -136,6 +138,34 @@#define STM32MP_MTDPARTS #endif +#define STM32MP_DFU_ALT_RAM \ + "dfu_alt_info_ram=ram 0=" \ + "uImage ram ${kernel_addr_r} 0x2000000;" \ + "devicetree.dtb ram ${fdt_addr_r} 0x100000;" \ + "uramdisk.image.gz ram ${ramdisk_addr_r} 0x10000000\0" + +#ifdef CONFIG_SET_DFU_ALT_INFO +#define STM32MP_DFU_ALT_INFO \ + "dfu_alt_info_nor0=mtd nor0=" \ + "nor_fsbl1 part 1;nor_fsbl2 part 2;" \ + "nor_ssbl part 3;nor_env part 4\0" \ + "dfu_alt_info_nand0=mtd nand0="\ + "nand_fsbl part 1;nand_ssbl1 part 2;" \ + "nand_ssbl2 part 3;nand_UBI partubi 4\0" \ + "dfu_alt_info_mmc0=mmc 0=" \ + "sdcard_fsbl1 part 0 1;sdcard_fsbl2 part 0 2;" \ + "sdcard_ssbl part 0 3;sdcard_bootfs part 0 4;" \ + "sdcard_vendorfs part 0 5;sdcard_rootfs part 0 6;" \ + "sdcard_userfs part 0 7\0" \ + "dfu_alt_info_mmc1=mmc 1=" \ + "emmc_fsbl1 raw 0x0 0x200 mmcpart 1;" \ + "emmc_fsbl2 raw 0x0 0x200 mmcpart 2;emmc_ssbl part 1 1;" \ + "emmc_bootfs part 1 2;emmc_vendorfs part 1 3;" \ + "emmc_rootfs part 1 4;emmc_userfs part 1 5\0" +#else +#define STM32MP_DFU_ALT_INFO +#endif +/* * memory layout for 32M uncompressed/compressed kernel, * 1M fdt, 1M script, 1M pxe and 1M for splashimage
@@ -157,6 +187,8 @@" then env set env_default 0;env save;fi\0" \STM32MP_BOOTCMD \STM32MP_MTDPARTS \ +STM32MP_DFU_ALT_RAM \ +STM32MP_DFU_ALT_INFO \BOOTENV \"boot_net_usb_start=true\0"
Signature · 1 line
2.17.1
PATCH v3 12/15 stm32mp1: activate SET_DFU_ALT_INFO
Hi Patrick
Quoted 260 lines · Patrick Delaunay
Generate automatically
dfu_alt_infofor the supported device. The simple command "dfu 0" allows to start the dfu stack on usb 0 for the supported devices:
- dfu mtd for nand0
- dfu mtd for nor0
- dfu mmc for SDCard
- dfu mmc for eMMC
- dfu ram for images in DDRThe DUF alternate use the "part", "partubi" and "mmcpart" options to select the correct MTD or GPT partition or the eMMC hw boot partition.
Signed-off-by Patrick Delaunay <[email protected]>---
Changes in v3: None
Changes in v2: Noneboard/st/stm32mp1/README | 111 +++++++++++++++++++++++++++++++++++ board/st/stm32mp1/stm32mp1.c | 51 ++++++++++++++++ include/configs/stm32mp1.h | 32 ++++++++++ 3 files changed, 194 insertions(+)board/st/stm32mp1/README +111
-0@@ -390,3 +390,114 @@ B/ Automatically by using FIT feature and generic DISTRO bootcmd the correct configuration => stm32mp157c-ev1-m4 => stm32mp157c-dk2-m4 + +11. DFU support +=============== + +The DFU is supported on ST board. +The env variable dfu_alt_info is automatically build, and all +the memory present on the ST boards are exported. + +The mode is started by + +STM32MP> dfu 0 + +On EV1 board: + +STM32MP> dfu 0 list + +DFU alt settings list: +dev: RAM alt: 0 name: uImage layout: RAM_ADDR +dev: RAM alt: 1 name: devicetree.dtb layout: RAM_ADDR +dev: RAM alt: 2 name: uramdisk.image.gz layout: RAM_ADDR +dev: eMMC alt: 3 name: sdcard_fsbl1 layout: RAW_ADDR +dev: eMMC alt: 4 name: sdcard_fsbl2 layout: RAW_ADDR +dev: eMMC alt: 5 name: sdcard_ssbl layout: RAW_ADDR +dev: eMMC alt: 6 name: sdcard_bootfs layout: RAW_ADDR +dev: eMMC alt: 7 name: sdcard_vendorfs layout: RAW_ADDR +dev: eMMC alt: 8 name: sdcard_rootfs layout: RAW_ADDR +dev: eMMC alt: 9 name: sdcard_userfs layout: RAW_ADDR +dev: eMMC alt: 10 name: emmc_fsbl1 layout: RAW_ADDR +dev: eMMC alt: 11 name: emmc_fsbl2 layout: RAW_ADDR +dev: eMMC alt: 12 name: emmc_ssbl layout: RAW_ADDR +dev: eMMC alt: 13 name: emmc_bootfs layout: RAW_ADDR +dev: eMMC alt: 14 name: emmc_vendorfs layout: RAW_ADDR +dev: eMMC alt: 15 name: emmc_rootfs layout: RAW_ADDR +dev: eMMC alt: 16 name: emmc_userfs layout: RAW_ADDR +dev: MTD alt: 17 name: nor_fsbl1 layout: RAW_ADDR +dev: MTD alt: 18 name: nor_fsbl2 layout: RAW_ADDR +dev: MTD alt: 19 name: nor_ssbl layout: RAW_ADDR +dev: MTD alt: 20 name: nor_env layout: RAW_ADDR +dev: MTD alt: 21 name: nand_fsbl layout: RAW_ADDR +dev: MTD alt: 22 name: nand_ssbl1 layout: RAW_ADDR +dev: MTD alt: 23 name: nand_ssbl2 layout: RAW_ADDR +dev: MTD alt: 24 name: nand_UBI layout: RAW_ADDR +dev: VIRT alt: 25 name: OTP layout: RAW_ADDR +dev: VIRT alt: 26 name: PMIC layout: RAW_ADDR + +All the supported device are exported for dfu-util tool: + +$> dfu-util -l +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=26, name="PMIC", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=25, name="OTP", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=24, name="nand_UBI", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=23, name="nand_ssbl2", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=22, name="nand_ssbl1", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=21, name="nand_fsbl", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=20, name="nor_env", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=19, name="nor_ssbl", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=18, name="nor_fsbl2", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=17, name="nor_fsbl1", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=16, name="emmc_userfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=15, name="emmc_rootfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=14, name="emmc_vendorfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=13, name="emmc_bootfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=12, name="emmc_ssbl", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=11, name="emmc_fsbl2", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=10, name="emmc_fsbl1", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=9, name="sdcard_userfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=8, name="sdcard_rootfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=7, name="sdcard_vendorfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=6, name="sdcard_bootfs", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=5, name="sdcard_ssbl", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=4, name="sdcard_fsbl2", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=3, name="sdcard_fsbl1", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=2, name="uramdisk.image.gz", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=1, name="devicetree.dtb", serial="002700333338511934383330" +Found DFU: [0483:5720] ver=9999, devnum=99, cfg=1, intf=0, alt=0, name="uImage", serial="002700333338511934383330" + +You can update the boot device: + +#SDCARD +$> dfu-util -d 0483:5720 -a 3 -D tf-a-stm32mp157c-ev1-trusted.stm32 +$> dfu-util -d 0483:5720 -a 4 -D tf-a-stm32mp157c-ev1-trusted.stm32 +$> dfu-util -d 0483:5720 -a 5 -D u-boot-stm32mp157c-ev1-trusted.img +$> dfu-util -d 0483:5720 -a 6 -D st-image-bootfs-openstlinux-weston-stm32mp1.ext4 +$> dfu-util -d 0483:5720 -a 7 -D st-image-vendorfs-openstlinux-weston-stm32mp1.ext4 +$> dfu-util -d 0483:5720 -a 8 -D st-image-weston-openstlinux-weston-stm32mp1.ext4 +$> dfu-util -d 0483:5720 -a 9 -D st-image-userfs-openstlinux-weston-stm32mp1.ext4 + +#EMMC +$> dfu-util -d 0483:5720 -a 10 -D tf-a-stm32mp157c-ev1-trusted.stm32 +$> dfu-util -d 0483:5720 -a 11 -D tf-a-stm32mp157c-ev1-trusted.stm32 +$> dfu-util -d 0483:5720 -a 12 -D u-boot-stm32mp157c-ev1-trusted.img +$> dfu-util -d 0483:5720 -a 13 -D st-image-bootfs-openstlinux-weston-stm32mp1.ext4 +$> dfu-util -d 0483:5720 -a 14 -D st-image-vendorfs-openstlinux-weston-stm32mp1.ext4 +$> dfu-util -d 0483:5720 -a 15 -D st-image-weston-openstlinux-weston-stm32mp1.ext4 +$> dfu-util -d 0483:5720 -a 16 -D st-image-userfs-openstlinux-weston-stm32mp1.ext4 + +#NOR +$> dfu-util -d 0483:5720 -a 17 -D tf-a-stm32mp157c-ev1-trusted.stm32 +$> dfu-util -d 0483:5720 -a 18 -D tf-a-stm32mp157c-ev1-trusted.stm32 +$> dfu-util -d 0483:5720 -a 19 -D u-boot-stm32mp157c-ev1-trusted.img + +#NAND (UBI partition used for NAND only boot or NOR + NAND boot) +$> dfu-util -d 0483:5720 -a 21 -D tf-a-stm32mp157c-ev1-trusted.stm32 +$> dfu-util -d 0483:5720 -a 22 -D u-boot-stm32mp157c-ev1-trusted.img +$> dfu-util -d 0483:5720 -a 23 -D u-boot-stm32mp157c-ev1-trusted.img +$> dfu-util -d 0483:5720 -a 24 -D st-image-weston-openstlinux-weston-stm32mp1_nand_4_256_multivolume.ubi + +And you can also dump the OTP and the PMIC NVM with: + +$> dfu-util -d 0483:5720 -a 25 -U otp.bin +$> dfu-util -d 0483:5720 -a 26 -U pmic.binboard/st/stm32mp1/stm32mp1.c +51
-0@@ -14,6 +14,7 @@#include <generic-phy.h> #include <i2c.h> #include <led.h> +#include <memalign.h> #include <misc.h> #include <mtd.h> #include <mtd_node.h> @@ -903,6 +904,56 @@ int ft_board_setup(void *blob, bd_t *bd) }#endif +#ifdef CONFIG_SET_DFU_ALT_INFO +#define DFU_ALT_BUF_LEN SZ_1K + +static void board_get_alt_info (const char *dev,char *buff) +{ +char var_name[32 ] ="dfu_alt_info_" ; +int ret; + +ALLOC_CACHE_ALIGN_BUFFER (char, tmp_alt,DFU_ALT_BUF_LEN ); + +/* name of env variable to read = dfu_alt_info_<dev> */ +strcat (var_name, dev); + ret =env_get_f (var_name, tmp_alt,DFU_ALT_BUF_LEN ); +if (ret) { +if (buff[0 ] !='\0' ) +strcat (buff,"&" ); +strncat (buff, tmp_alt,DFU_ALT_BUF_LEN ); + } +} + +void set_dfu_alt_info (char *interface,char *devstr) +{ +struct udevice *dev; + +ALLOC_CACHE_ALIGN_BUFFER (char, buf,DFU_ALT_BUF_LEN ); + +if (env_get ("dfu_alt_info" )) +return ; + +memset (buf,0 ,sizeof (buf)); + +board_get_alt_info ("ram" , buf); + +if (!uclass_get_device (UCLASS_MMC ,0 , &dev)) +board_get_alt_info ("mmc0" , buf); + +if (!uclass_get_device (UCLASS_MMC ,1 , &dev)) +board_get_alt_info ("mmc1" , buf); + +if (!uclass_get_device (UCLASS_SPI_FLASH ,0 , &dev)) +board_get_alt_info ("nor0" , buf); + +if (!uclass_get_device (UCLASS_MTD ,0 , &dev)) +board_get_alt_info ("nand0" , buf); + +env_set ("dfu_alt_info" , buf); +puts ("DFU alt info setting: done\n" ); +} +#endif +static void board_copro_image_process (ulong fw_image,size_t fw_size) {int ret, id =0 ;/* Copro id fixed to 0 as only one coproc on mp1 */ include/configs/stm32mp1.h +30
-0@@ -83,6 +83,8 @@#define CONFIG_SYS_MTDPARTS_RUNTIME #endif +#define CONFIG_SET_DFU_ALT_INFO +/*****************************************************************************/ #ifdef CONFIG_DISTRO_DEFAULTS /*****************************************************************************/ @@ -136,6 +138,34 @@#define STM32MP_MTDPARTS #endif +#define STM32MP_DFU_ALT_RAM \ + "dfu_alt_info_ram=ram 0=" \ + "uImage ram ${kernel_addr_r} 0x2000000;" \ + "devicetree.dtb ram ${fdt_addr_r} 0x100000;" \ + "uramdisk.image.gz ram ${ramdisk_addr_r} 0x10000000\0" + +#ifdef CONFIG_SET_DFU_ALT_INFO +#define STM32MP_DFU_ALT_INFO \ + "dfu_alt_info_nor0=mtd nor0=" \ + "nor_fsbl1 part 1;nor_fsbl2 part 2;" \ + "nor_ssbl part 3;nor_env part 4\0" \ + "dfu_alt_info_nand0=mtd nand0="\ + "nand_fsbl part 1;nand_ssbl1 part 2;" \ + "nand_ssbl2 part 3;nand_UBI partubi 4\0" \ + "dfu_alt_info_mmc0=mmc 0=" \ + "sdcard_fsbl1 part 0 1;sdcard_fsbl2 part 0 2;" \ + "sdcard_ssbl part 0 3;sdcard_bootfs part 0 4;" \ + "sdcard_vendorfs part 0 5;sdcard_rootfs part 0 6;" \ + "sdcard_userfs part 0 7\0" \ + "dfu_alt_info_mmc1=mmc 1=" \ + "emmc_fsbl1 raw 0x0 0x200 mmcpart 1;" \ + "emmc_fsbl2 raw 0x0 0x200 mmcpart 2;emmc_ssbl part 1 1;" \ + "emmc_bootfs part 1 2;emmc_vendorfs part 1 3;" \ + "emmc_rootfs part 1 4;emmc_userfs part 1 5\0" +#else +#define STM32MP_DFU_ALT_INFO +#endif +/* * memory layout for 32M uncompressed/compressed kernel, * 1M fdt, 1M script, 1M pxe and 1M for splashimage
include/configs/stm32mp1.h line 194
Quoted 8 lines
include/configs/stm32mp1.h +2
-0@@ -157,6 +187,8 @@" then env set env_default 0;env save;fi\0" \STM32MP_BOOTCMD \STM32MP_MTDPARTS \ +STM32MP_DFU_ALT_RAM \ +STM32MP_DFU_ALT_INFO \BOOTENV \"boot_net_usb_start=true\0"
Thanks
PATCH v3 12/15 stm32mp1: activate SET_DFU_ALT_INFO
In reply to Patrick DelaunayHi,
Quoted 12 lines
From: Patrick DELAUNAY <[email protected]>
Sent: lundi 14 octobre 2019 09:28Generate automatically
dfu_alt_infofor the supported device. The simple command "dfu 0" allows to start the dfu stack on usb 0 for the supported devices:
- dfu mtd for nand0
- dfu mtd for nor0
- dfu mmc for SDCard
- dfu mmc for eMMC
- dfu ram for images in DDR
Quoted 5 lines
The DUF alternate use the "part", "partubi" and "mmcpart" options to select the correct MTD or GPT partition or the eMMC hw boot partition.
Signed-off-by Patrick Delaunay <[email protected]>---
Applied to u-boot-stm32/master, thanks!
Signature · 1 line
Patrick
PATCH v3 13/15 stm32mp1: configs: activate CONFIG_MTD_SPI_NAND
In reply to Patrick DelaunayActivate the support of SPI NAND in stm32mp1 U-Boot.
---
Changes in v3: None
Changes in v2: None
configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_optee_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + 3 files changed, 3 insertions(+)
configs/stm32mp15_basic_defconfig +1 -0
@@ -86,6 +86,7 @@ CONFIG_STM32_SDMMC2=y CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_STM32_FMC2=y +CONFIG_MTD_SPI_NAND=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y
configs/stm32mp15_optee_defconfig +1 -0
@@ -73,6 +73,7 @@ CONFIG_STM32_SDMMC2=y CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_STM32_FMC2=y +CONFIG_MTD_SPI_NAND=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y
configs/stm32mp15_trusted_defconfig +1 -0
@@ -72,6 +72,7 @@ CONFIG_STM32_SDMMC2=y CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_STM32_FMC2=y +CONFIG_MTD_SPI_NAND=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y
Signature · 1 line
2.17.1
PATCH v3 13/15 stm32mp1: configs: activate CONFIG_MTD_SPI_NAND
Hi Patrick
Quoted 42 lines · Patrick Delaunay
Activate the support of SPI NAND in stm32mp1 U-Boot.
Signed-off-by Patrick Delaunay <[email protected]>---
Changes in v3: None
Changes in v2: Noneconfigs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_optee_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + 3 files changed, 3 insertions(+)configs/stm32mp15_basic_defconfig +1
-0@@ -86,6 +86,7 @@ CONFIG_STM32_SDMMC2=y CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_STM32_FMC2=y +CONFIG_MTD_SPI_NAND=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=yconfigs/stm32mp15_optee_defconfig +1
-0@@ -73,6 +73,7 @@ CONFIG_STM32_SDMMC2=y CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_STM32_FMC2=y +CONFIG_MTD_SPI_NAND=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=yconfigs/stm32mp15_trusted_defconfig +0
-0
configs/stm32mp15_trusted_defconfig CONFIG_STM32_SDMMC2=y · line 78
Quoted 7 lines
configs/stm32mp15_trusted_defconfig +1
-0@@ -72,6 +72,7 @@ CONFIG_STM32_SDMMC2=y CONFIG_MTD=y CONFIG_NAND=y CONFIG_NAND_STM32_FMC2=y +CONFIG_MTD_SPI_NAND=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y
PATCH v3 13/15 stm32mp1: configs: activate CONFIG_MTD_SPI_NAND
In reply to Patrick DelaunayHi,
Quoted 7 lines
From: Patrick DELAUNAY <[email protected]>
Sent: lundi 14 octobre 2019 09:28Activate the support of SPI NAND in stm32mp1 U-Boot.
Signed-off-by Patrick Delaunay <[email protected]>---
Applied to u-boot-stm32/master, thanks!
Signature · 1 line
Patrick
PATCH v3 14/15 stm32mp1: board: add spi nand support
In reply to Patrick DelaunayThis patch adds the support of the spi nand device in mtdparts command and in dfu_alt_info.
---
Changes in v3: None
Changes in v2: None
board/st/stm32mp1/stm32mp1.c | 32 +++++++++++++++++++++++++++++--- include/configs/stm32mp1.h | 10 ++++++++-- 2 files changed, 37 insertions(+), 5 deletions(-)
board/st/stm32mp1/stm32mp1.c +29 -3
@@ -862,8 +862,9 @@ static void board_get_mtdparts(const char *dev,void board_mtdparts_default (const char **mtdids,const char **mtdparts) { +struct mtd_info *mtd;struct udevice *dev; -static char parts[2 *MTDPARTS_LEN +1 ]; +static char parts[3 *MTDPARTS_LEN +1 ];static char ids[MTDIDS_LEN +1 ];static bool mtd_initialized;
@@ -876,8 +877,24 @@ void board_mtdparts_default(const char **mtdids, const char **mtdparts)memset (parts,0 ,sizeof (parts));memset (ids,0 ,sizeof (ids)); -if (!uclass_get_device (UCLASS_MTD ,0 , &dev)) +/* probe all MTD devices */ +for (uclass_first_device (UCLASS_MTD , &dev); + dev; +uclass_next_device (&dev)) { +pr_debug ("mtd device = %s\n" , dev->name); + } + + mtd =get_mtd_device_nm ("nand0" ); +if (!IS_ERR_OR_NULL (mtd)) {board_get_mtdparts ("nand0" , ids, parts); +put_mtd_device (mtd); + } + + mtd =get_mtd_device_nm ("spi-nand0" ); +if (!IS_ERR_OR_NULL (mtd)) { +board_get_mtdparts ("spi-nand0" , ids, parts); +put_mtd_device (mtd); + }if (!uclass_get_device (UCLASS_SPI_FLASH ,0 , &dev))board_get_mtdparts ("nor0" , ids, parts);
@@ -927,6 +944,7 @@ static void board_get_alt_info(const char *dev, char *buff)void set_dfu_alt_info (char *interface,char *devstr) {struct udevice *dev; +struct mtd_info *mtd;ALLOC_CACHE_ALIGN_BUFFER (char, buf,DFU_ALT_BUF_LEN );
@@ -935,6 +953,9 @@ void set_dfu_alt_info(char *interface, char *devstr)memset (buf,0 ,sizeof (buf)); +/* probe all MTD devices */ +mtd_probe_devices (); +board_get_alt_info ("ram" , buf);if (!uclass_get_device (UCLASS_MMC ,0 , &dev))
@@ -946,9 +967,14 @@ void set_dfu_alt_info(char *interface, char *devstr)if (!uclass_get_device (UCLASS_SPI_FLASH ,0 , &dev))board_get_alt_info ("nor0" , buf); -if (!uclass_get_device (UCLASS_MTD ,0 , &dev)) + mtd =get_mtd_device_nm ("nand0" ); +if (!IS_ERR_OR_NULL (mtd))board_get_alt_info ("nand0" , buf); + mtd =get_mtd_device_nm ("spi-nand0" ); +if (!IS_ERR_OR_NULL (mtd)) +board_get_alt_info ("spi-nand0" , buf); +env_set ("dfu_alt_info" , buf);puts ("DFU alt info setting: done\n" ); }
include/configs/stm32mp1.h +8 -2
@@ -124,12 +124,15 @@/* with OPTEE: define specific MTD partitions = teeh, teed, teex */ #define STM32MP_MTDPARTS \ "mtdparts_nor0=256k(fsbl1),256k(fsbl2),2m(ssbl),256k(u-boot-env),256k(teeh),256k(teed),256k(teex),-(nor_user)\0" \ - "mtdparts_nand0=2m(fsbl),2m(ssbl1),2m(ssbl2),512k(teeh),512k(teed),512k(teex),-(UBI)\0" + "mtdparts_nand0=2m(fsbl),2m(ssbl1),2m(ssbl2),512k(teeh),512k(teed),512k(teex),-(UBI)\0" \ + "mtdparts_spi-nand0=2m(fsbl),2m(ssbl1),2m(ssbl2),"\ + "512k(teeh),512k(teed),512k(teex),-(UBI)\0"#else /* CONFIG_STM32MP1_OPTEE */ #define STM32MP_MTDPARTS \ "mtdparts_nor0=256k(fsbl1),256k(fsbl2),2m(ssbl),256k(u-boot-env),-(nor_user)\0" \ - "mtdparts_nand0=2m(fsbl),2m(ssbl1),2m(ssbl2),-(UBI)\0" + "mtdparts_nand0=2m(fsbl),2m(ssbl1),2m(ssbl2),-(UBI)\0" \ + "mtdparts_spi-nand0=2m(fsbl),2m(ssbl1),2m(ssbl2),-(UBI)\0"#endif /* CONFIG_STM32MP1_OPTEE */
@@ -152,6 +155,9 @@"dfu_alt_info_nand0=mtd nand0=" \"nand_fsbl part 1;nand_ssbl1 part 2;" \"nand_ssbl2 part 3;nand_UBI partubi 4\0" \ +"dfu_alt_info_spi-nand0=mtd spi-nand0=" \ +"spi-nand_fsbl part 1;spi-nand_ssbl1 part 2;" \ +"spi-nand_ssbl2 part 3;spi-nand_UBI partubi 4\0" \"dfu_alt_info_mmc0=mmc 0=" \"sdcard_fsbl1 part 0 1;sdcard_fsbl2 part 0 2;" \"sdcard_ssbl part 0 3;sdcard_bootfs part 0 4;" \
Signature · 1 line
2.17.1
PATCH v3 14/15 stm32mp1: board: add spi nand support
Hi Patrick
Quoted 111 lines · Patrick Delaunay
This patch adds the support of the spi nand device in mtdparts command and in
dfu_alt_info.Signed-off-by Patrick Delaunay <[email protected]>---
Changes in v3: None
Changes in v2: Noneboard/st/stm32mp1/stm32mp1.c | 32 +++++++++++++++++++++++++++++--- include/configs/stm32mp1.h | 10 ++++++++-- 2 files changed, 37 insertions(+), 5 deletions(-)board/st/stm32mp1/stm32mp1.c +29
-3@@ -862,8 +862,9 @@ static void board_get_mtdparts(const char *dev,void board_mtdparts_default (const char **mtdids,const char **mtdparts) { +struct mtd_info *mtd;struct udevice *dev; -static char parts[2 *MTDPARTS_LEN +1 ]; +static char parts[3 *MTDPARTS_LEN +1 ];static char ids[MTDIDS_LEN +1 ];static bool mtd_initialized;@@ -876,8 +877,24 @@ void board_mtdparts_default(const char **mtdids, const char **mtdparts)memset (parts,0 ,sizeof (parts));memset (ids,0 ,sizeof (ids)); -if (!uclass_get_device (UCLASS_MTD ,0 , &dev)) +/* probe all MTD devices */ +for (uclass_first_device (UCLASS_MTD , &dev); + dev; +uclass_next_device (&dev)) { +pr_debug ("mtd device = %s\n" , dev->name); + } + + mtd =get_mtd_device_nm ("nand0" ); +if (!IS_ERR_OR_NULL (mtd)) {board_get_mtdparts ("nand0" , ids, parts); +put_mtd_device (mtd); + } + + mtd =get_mtd_device_nm ("spi-nand0" ); +if (!IS_ERR_OR_NULL (mtd)) { +board_get_mtdparts ("spi-nand0" , ids, parts); +put_mtd_device (mtd); + }if (!uclass_get_device (UCLASS_SPI_FLASH ,0 , &dev))board_get_mtdparts ("nor0" , ids, parts);@@ -927,6 +944,7 @@ static void board_get_alt_info(const char *dev, char *buff)void set_dfu_alt_info (char *interface,char *devstr) {struct udevice *dev; +struct mtd_info *mtd;ALLOC_CACHE_ALIGN_BUFFER (char, buf,DFU_ALT_BUF_LEN );@@ -935,6 +953,9 @@ void set_dfu_alt_info(char *interface, char *devstr)memset (buf,0 ,sizeof (buf)); +/* probe all MTD devices */ +mtd_probe_devices (); +board_get_alt_info ("ram" , buf);if (!uclass_get_device (UCLASS_MMC ,0 , &dev))@@ -946,9 +967,14 @@ void set_dfu_alt_info(char *interface, char *devstr)if (!uclass_get_device (UCLASS_SPI_FLASH ,0 , &dev))board_get_alt_info ("nor0" , buf); -if (!uclass_get_device (UCLASS_MTD ,0 , &dev)) + mtd =get_mtd_device_nm ("nand0" ); +if (!IS_ERR_OR_NULL (mtd))board_get_alt_info ("nand0" , buf); + mtd =get_mtd_device_nm ("spi-nand0" ); +if (!IS_ERR_OR_NULL (mtd)) +board_get_alt_info ("spi-nand0" , buf); +env_set ("dfu_alt_info" , buf);puts ("DFU alt info setting: done\n" ); }include/configs/stm32mp1.h +5
-2@@ -124,12 +124,15 @@/* with OPTEE: define specific MTD partitions = teeh, teed, teex */ #define STM32MP_MTDPARTS \ "mtdparts_nor0=256k(fsbl1),256k(fsbl2),2m(ssbl),256k(u-boot-env),256k(teeh),256k(teed),256k(teex),-(nor_user)\0" \ - "mtdparts_nand0=2m(fsbl),2m(ssbl1),2m(ssbl2),512k(teeh),512k(teed),512k(teex),-(UBI)\0" + "mtdparts_nand0=2m(fsbl),2m(ssbl1),2m(ssbl2),512k(teeh),512k(teed),512k(teex),-(UBI)\0" \ + "mtdparts_spi-nand0=2m(fsbl),2m(ssbl1),2m(ssbl2),"\ + "512k(teeh),512k(teed),512k(teex),-(UBI)\0"#else /* CONFIG_STM32MP1_OPTEE */ #define STM32MP_MTDPARTS \ "mtdparts_nor0=256k(fsbl1),256k(fsbl2),2m(ssbl),256k(u-boot-env),-(nor_user)\0" \ - "mtdparts_nand0=2m(fsbl),2m(ssbl1),2m(ssbl2),-(UBI)\0" + "mtdparts_nand0=2m(fsbl),2m(ssbl1),2m(ssbl2),-(UBI)\0" \ + "mtdparts_spi-nand0=2m(fsbl),2m(ssbl1),2m(ssbl2),-(UBI)\0"#endif /* CONFIG_STM32MP1_OPTEE */
include/configs/stm32mp1.h line 163
Quoted 9 lines
include/configs/stm32mp1.h +3
-0@@ -152,6 +155,9 @@"dfu_alt_info_nand0=mtd nand0=" \"nand_fsbl part 1;nand_ssbl1 part 2;" \"nand_ssbl2 part 3;nand_UBI partubi 4\0" \ +"dfu_alt_info_spi-nand0=mtd spi-nand0=" \ +"spi-nand_fsbl part 1;spi-nand_ssbl1 part 2;" \ +"spi-nand_ssbl2 part 3;spi-nand_UBI partubi 4\0" \"dfu_alt_info_mmc0=mmc 0=" \"sdcard_fsbl1 part 0 1;sdcard_fsbl2 part 0 2;" \"sdcard_ssbl part 0 3;sdcard_bootfs part 0 4;" \
Thanks
PATCH v3 14/15 stm32mp1: board: add spi nand support
In reply to Patrick DelaunayHi,
Quoted 8 lines
From: Patrick DELAUNAY <[email protected]>
Sent: lundi 14 octobre 2019 09:28This patch adds the support of the spi nand device in mtdparts command and in
dfu_alt_info.Signed-off-by Patrick Delaunay <[email protected]>---
Applied to u-boot-stm32/master, thanks!
Signature · 1 line
Patrick
PATCH v3 15/15 stm32mp1: add support for virtual partition read
In reply to Patrick DelaunayAdd read for OTP and PMIC NVM with alternates
on virtual DFU device.
Serie-cc: Boris Brezillon <[email protected]>
---
Changes in v3:
- rebase on v2019.10
- remove previous patch 16/16 pushed by error in v2
http://patchwork.ozlabs.org/patch/1162076/
Changes in v2:
- Update after Lukasz Majewski comments
board/st/stm32mp1/stm32mp1.c | 83 +++++++++++++++++++++++++++++ configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_optee_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + 4 files changed, 86 insertions(+)
board/st/stm32mp1/stm32mp1.c +83 -0
@@ -975,9 +975,92 @@ void set_dfu_alt_info(char *interface, char *devstr)if (!IS_ERR_OR_NULL (mtd))board_get_alt_info ("spi-nand0" , buf); +#ifdef CONFIG_DFU_VIRT +strncat (buf,"&virt 0=OTP" ,DFU_ALT_BUF_LEN ); + +if (IS_ENABLED (CONFIG_PMIC_STPMIC1 )) +strncat (buf,"&virt 1=PMIC" ,DFU_ALT_BUF_LEN ); +#endif +env_set ("dfu_alt_info" , buf);puts ("DFU alt info setting: done\n" ); } + +#if CONFIG_IS_ENABLED (DFU_VIRT ) +#include <dfu.h> +#include <power/stpmic1.h> + +int dfu_otp_read (u64 offset,u8 *buffer,long *size) +{ +struct udevice *dev; +int ret; + + ret =uclass_get_device_by_driver (UCLASS_MISC , +DM_GET_DRIVER (stm32mp_bsec), + &dev); +if (ret) +return ret; + + ret =misc_read (dev, offset +STM32_BSEC_OTP_OFFSET , buffer, *size); +if (ret >=0 ) { + *size = ret; + ret =0 ; + } + +return 0 ; +} + +int dfu_pmic_read (u64 offset,u8 *buffer,long *size) +{ +int ret; +#ifdef CONFIG_PMIC_STPMIC1 +struct udevice *dev; + + ret =uclass_get_device_by_driver (UCLASS_MISC , +DM_GET_DRIVER (stpmic1_nvm), + &dev); +if (ret) +return ret; + + ret =misc_read (dev,0xF8 + offset, buffer, *size); +if (ret >=0 ) { + *size = ret; + ret =0 ; + } +if (ret == -EACCES ) { + *size =0 ; + ret =0 ; + } +#else +pr_err ("PMIC update not supported" ); + ret = -EOPNOTSUPP ; +#endif + +return ret; +} + +int dfu_read_medium_virt (struct dfu_entity *dfu,u64 offset, +void *buf,long *len) +{ +switch (dfu->data.virt.dev_num) { +case 0x0 : +return dfu_otp_read (offset, buf, len); +case 0x1 : +return dfu_pmic_read (offset, buf, len); + } + *len =0 ; +return 0 ; +} + +int __weak dfu_get_medium_size_virt (struct dfu_entity *dfu,u64 *size) +{ + *size =SZ_1K ; + +return 0 ; +} + +#endif +#endif static void board_copro_image_process (ulong fw_image,size_t fw_size)
configs/stm32mp15_basic_defconfig +1 -0
@@ -66,6 +66,7 @@ CONFIG_STM32_ADC=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y +CONFIG_DFU_VIRT=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000
configs/stm32mp15_optee_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_STM32_ADC=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y +CONFIG_DFU_VIRT=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000
configs/stm32mp15_trusted_defconfig +1 -0
@@ -52,6 +52,7 @@ CONFIG_STM32_ADC=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y +CONFIG_DFU_VIRT=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000
Signature · 1 line
2.17.1
PATCH v3 15/15 stm32mp1: add support for virtual partition read
Hi Patrick
see below
Quoted 52 lines · Patrick Delaunay
Add read for OTP and PMIC NVM with alternates
on virtual DFU device.Serie-cc: Boris Brezillon <[email protected]>
Signed-off-by Patrick Delaunay <[email protected]>---
Changes in v3:
- rebase on v2019.10
- remove previous patch 16/16 pushed by error in v2
http://patchwork.ozlabs.org/patch/1162076/Changes in v2:
- Update after Lukasz Majewski commentsboard/st/stm32mp1/stm32mp1.c | 83 +++++++++++++++++++++++++++++ configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_optee_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + 4 files changed, 86 insertions(+)board/st/stm32mp1/stm32mp1.c +20
-0@@ -975,9 +975,92 @@ void set_dfu_alt_info(char *interface, char *devstr)if (!IS_ERR_OR_NULL (mtd))board_get_alt_info ("spi-nand0" , buf); +#ifdef CONFIG_DFU_VIRT +strncat (buf,"&virt 0=OTP" ,DFU_ALT_BUF_LEN ); + +if (IS_ENABLED (CONFIG_PMIC_STPMIC1 )) +strncat (buf,"&virt 1=PMIC" ,DFU_ALT_BUF_LEN ); +#endif +env_set ("dfu_alt_info" , buf);puts ("DFU alt info setting: done\n" ); } + +#if CONFIG_IS_ENABLED (DFU_VIRT ) +#include <dfu.h> +#include <power/stpmic1.h> + +int dfu_otp_read (u64 offset,u8 *buffer,long *size) +{ +struct udevice *dev; +int ret; + + ret =uclass_get_device_by_driver (UCLASS_MISC , +DM_GET_DRIVER (stm32mp_bsec), + &dev);
board/st/stm32mp1/stm32mp1.c void set_dfu_alt_info(char *interface, char *devstr) · line 1010
Quoted 10 lines
board/st/stm32mp1/stm32mp1.c +10
-0+if (ret) +return ret; + + ret =misc_read (dev, offset +STM32_BSEC_OTP_OFFSET , buffer, *size); +if (ret >=0 ) { + *size = ret; + ret =0 ; + } + +return 0 ;
"return ret;" instead ?
Quoted 31 lines
board/st/stm32mp1/stm32mp1.c +31
-0+} + +int dfu_pmic_read (u64 offset,u8 *buffer,long *size) +{ +int ret; +#ifdef CONFIG_PMIC_STPMIC1 +struct udevice *dev; + + ret =uclass_get_device_by_driver (UCLASS_MISC , +DM_GET_DRIVER (stpmic1_nvm), + &dev); +if (ret) +return ret; + + ret =misc_read (dev,0xF8 + offset, buffer, *size); +if (ret >=0 ) { + *size = ret; + ret =0 ; + } +if (ret == -EACCES ) { + *size =0 ; + ret =0 ; + } +#else +pr_err ("PMIC update not supported" ); + ret = -EOPNOTSUPP ; +#endif + +return ret; +} +
board/st/stm32mp1/stm32mp1.c void set_dfu_alt_info(char *interface, char *devstr) · line 1051
Quoted 10 lines
board/st/stm32mp1/stm32mp1.c +10
-0+int dfu_read_medium_virt (struct dfu_entity *dfu,u64 offset, +void *buf,long *len) +{ +switch (dfu->data.virt.dev_num) { +case 0x0 : +return dfu_otp_read (offset, buf, len); +case 0x1 : +return dfu_pmic_read (offset, buf, len); + } + *len =0 ;
insert a blank line
Quoted 51 lines
board/st/stm32mp1/stm32mp1.c +12
-0+return 0 ; +} + +int __weak dfu_get_medium_size_virt (struct dfu_entity *dfu,u64 *size) +{ + *size =SZ_1K ; + +return 0 ; +} + +#endif +#endif static void board_copro_image_process (ulong fw_image,size_t fw_size)configs/stm32mp15_basic_defconfig +1
-0@@ -66,6 +66,7 @@ CONFIG_STM32_ADC=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y +CONFIG_DFU_VIRT=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000configs/stm32mp15_optee_defconfig +1
-0@@ -53,6 +53,7 @@ CONFIG_STM32_ADC=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y +CONFIG_DFU_VIRT=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000configs/stm32mp15_trusted_defconfig +1
-0@@ -52,6 +52,7 @@ CONFIG_STM32_ADC=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y +CONFIG_DFU_VIRT=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000
PATCH v3 15/15 stm32mp1: add support for virtual partition read
In reply to Patrick DelaunayHi,
Quoted 8 lines
From: Patrick DELAUNAY <[email protected]>
Sent: lundi 14 octobre 2019 09:28Add read for OTP and PMIC NVM with alternates on virtual DFU device.
Serie-cc: Boris Brezillon <[email protected]>
Signed-off-by Patrick Delaunay <[email protected]>---
Applied to u-boot-stm32/master, thanks!
Signature · 1 line
Patrick