Raspberry Pi4: add support for DFU over USB
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): CGME20190924131119eucas1p2e457a2eaa370e6930d90b93d3ace9ce2@eucas1p2.samsung.com
v2 cover Raspberry Pi4: add support for DFU over USB
Hi All!
This patchset enables support for DFU over USB protocol on Raspberry Pi4 board. The board has DWC2 UDC controller connected to the USB-C power connector. Enabling DFU on it, make the u-boot development much more convenient, as one no longer needs to swap SD-card between RPi4 board and host machine to update the u-boot binary.
Patches are based on current 'master' u-boot branch. They were tested on the 2019-07-10-raspbian-buster-lite.img sd-card image with the following lines added to config.txt:
dtoverlay=dwc2,dr_mode=peripheral
dtparam=i2c_arm=on
dtparam=spi=on
enable_uart=1
uart_2ndstage=1
kernel=u-boot.bin
To enable DFU, one has to enter follwing command:
# dfu 0 mmc 0
During the development of this feature I've encountered a serious bugs in FAT write code. Over-writing discontiguous files always caused serious filesystem corruption. This was especially anoying, because the system environment is kept on FAT volume in uboot.env file, so 'saveenv' basically corrupted the boot partiting on the second call. Another bunch of the issues in the FAT write code has been revealed while removing predefined file size limit in DFU MMC code.
I hope that my fixes for FAT code will be helpful for non-RPi users too.
Best regards
Marek Szyprowski
Samsung R&D Institute Poland
Changelog:
v2:
- added changes to rpi_4_defconfig too (arm64 version)
- extended DFU entity list by confix.txt, cmdline.txt and Image.gz
- fixed missing '\0' at the end of dfu_alt_info env
- added reviewed-by tags
- added patches for DFU MMC to remove file size limit
- added patch for fat write to fix issues on non-zero file offset (revealed by previous patch)
v1: https://patchwork.ozlabs.org/cover/1162770/
- initial version
Patch summary:
Marek Szyprowski (6):
fat: write: fix broken write to fragmented files
fat: write: fix broken write at non-zero file offset
dfu: mmc: rearrange the code
dfu: mmc: remove file size limit for io operations
usb: dwc2_udc_otg: add bcm2835 SoC (Raspberry Pi4) support
config: enable DFU over USB on Raspberry Pi4 boards
configs/rpi_4_32b_defconfig | 11 +++ configs/rpi_4_defconfig | 11 +++ drivers/dfu/dfu_mmc.c | 93 +++++++++++++--------- drivers/usb/gadget/dwc2_udc_otg.c | 2 + drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 12 +-- fs/fat/fat_write.c | 18 ++--- include/configs/rpi.h | 17 ++++ 7 files changed, 113 insertions(+), 51 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/6 fat: write: fix broken write to fragmented files
The code for handing file overwrite incorrectly assumed that the file on disk is always contiguous. This resulted in corrupting disk structure every time when write to existing fragmented file happened. Fix this by adding proper check for cluster discontinuity and adjust chunk size on each partial write.
--- fs/fat/fat_write.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/fat/fat_write.c +3 -3
@@ -794,6 +794,8 @@ set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer, newclust =get_fatent (mydata, endclust); +if ((newclust -1 ) != endclust) +break ;if (IS_LAST_CLUST (newclust, mydata->fatsize))break ;if (CHECK_CLUST (newclust, mydata->fatsize)) {
@@ -811,7 +813,7 @@ set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer, offset =0 ; else offset = pos - cur_pos; - wsize =min (cur_pos + actsize, filesize) - pos; + wsize = min_t(unsigned long long, actsize, filesize - cur_pos);if (get_set_cluster (mydata, curclust, offset, buffer, wsize, &actsize)) {printf ("Error get-and-setting cluster\n" );
@@ -824,8 +826,6 @@ set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer,if (filesize <= cur_pos)break ; -/* CHECK: newclust = get_fatent(mydata, endclust); */ -if (IS_LAST_CLUST (newclust, mydata->fatsize))/* no more clusters */ break ;
Signature · 1 line
2.17.1
PATCH v2 2/6 fat: write: fix broken write at non-zero file offset
In reply to Marek SzyprowskiHandling of the start file offset was broken in the current code. Although the code skipped the needed clusters, it then tried to continue write with current cluster set to EOF, what caused assertion. It also lacked adjusting filesize in case of writing at the end of file and adjusting in-cluster offset for partial overwrite.
This patch fixes all those issues.
--- fs/fat/fat_write.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
fs/fat/fat_write.c +6 -6
@@ -756,14 +756,12 @@ set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer,/* go to cluster at pos */ cur_pos = bytesperclust;while (1 ) { + newclust =get_fatent (mydata, curclust);if (pos <= cur_pos)break ; -if (IS_LAST_CLUST (curclust, mydata->fatsize)) +if (IS_LAST_CLUST (newclust, mydata->fatsize))break ; - - newclust =get_fatent (mydata, curclust); -if (!IS_LAST_CLUST (newclust, mydata->fatsize) && -CHECK_CLUST (newclust, mydata->fatsize)) { +if (CHECK_CLUST (newclust, mydata->fatsize)) {debug ("curclust: 0x%x\n" , curclust);debug ("Invalid FAT entry\n" );return -1 ;
@@ -772,8 +770,9 @@ set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer, cur_pos += bytesperclust; curclust = newclust; } -if (IS_LAST_CLUST (curclust, mydata->fatsize)) { +if (IS_LAST_CLUST (newclust, mydata->fatsize)) {assert (pos == cur_pos); + filesize -= pos; goto set_clusters; }
@@ -814,6 +813,7 @@ set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer,else offset = pos - cur_pos; wsize = min_t(unsigned long long, actsize, filesize - cur_pos); + wsize -= offset;if (get_set_cluster (mydata, curclust, offset, buffer, wsize, &actsize)) {printf ("Error get-and-setting cluster\n" );
Signature · 1 line
2.17.1
PATCH v2 2/6 fat: write: fix broken write at non-zero file offset
Hi Marek,
Quoted 7 lines
Handling of the start file offset was broken in the current code. Although the code skipped the needed clusters, it then tried to continue write with current cluster set to EOF, what caused assertion. It also lacked adjusting filesize in case of writing at the end of file and adjusting in-cluster offset for partial overwrite.
This patch fixes all those issues.
Quoted 41 lines
Signed-off-by Marek Szyprowski <[email protected]>--- fs/fat/fat_write.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)fs/fat/fat_write.c +5
-6@@ -756,14 +756,12 @@ set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer, /* go to cluster at pos */ cur_pos = bytesperclust;while (1 ) { + newclust =get_fatent (mydata, curclust);if (pos <= cur_pos)break ; -if (IS_LAST_CLUST (curclust, mydata->fatsize)) +if (IS_LAST_CLUST (newclust, mydata->fatsize))break ; - - newclust =get_fatent (mydata, curclust); -if (!IS_LAST_CLUST (newclust, mydata->fatsize) && -CHECK_CLUST (newclust, mydata->fatsize)) { +if (CHECK_CLUST (newclust, mydata->fatsize)) {debug ("curclust: 0x%x\n" , curclust);debug ("Invalid FAT entry\n" );return -1 ;@@ -772,8 +770,9 @@ set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer, cur_pos += bytesperclust; curclust = newclust; } -if (IS_LAST_CLUST (curclust, mydata->fatsize)) { +if (IS_LAST_CLUST (newclust, mydata->fatsize)) {assert (pos == cur_pos); + filesize -= pos; goto set_clusters; }@@ -814,6 +813,7 @@ set_contents(fsdata *mydata, dir_entry *dentptr,
loff_tpos,__u8*buffer, else
fs/fat/fat_write.c set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer, · line 819
Quoted 7 lines
fs/fat/fat_write.c +1
-1offset = pos - cur_pos; wsize = min_t(unsigned long long, actsize, filesize - cur_pos); + wsize -= offset;if (get_set_cluster (mydata, curclust, offset, buffer, wsize, &actsize)) {printf ("Error get-and-setting cluster\n" );
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-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190924/29ae8096/attachment.sig>
PATCH v2 3/6 dfu: mmc: rearrange the code
In reply to Marek SzyprowskiRename functions for bufferred file io operations to make them easier to understand. Also add missing file offset argument to them (currently unused). All this is a preparation to remove predefined file size limit (CONFIG_SYS_DFU_MAX_FILE_SIZE) for DFU read/write operations.
--- drivers/dfu/dfu_mmc.c | 61 ++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 27 deletions(-)
drivers/dfu/dfu_mmc.c +34 -27
@@ -91,22 +91,8 @@ static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu,return 0 ; } -static int mmc_file_buffer (struct dfu_entity *dfu,void *buf,long *len) -{ -if (dfu_file_buf_len + *len >CONFIG_SYS_DFU_MAX_FILE_SIZE ) { - dfu_file_buf_len =0 ; -return -EINVAL ; - } - -/* Add to the current buffer. */ -memcpy (dfu_file_buf + dfu_file_buf_len, buf, *len); - dfu_file_buf_len += *len; - -return 0 ; -} -static int mmc_file_op (enum dfu_op op,struct dfu_entity *dfu, -void *buf,u64 *len) +u64 offset,void *buf,u64 *len) {char dev_part_str[8 ];int ret;
@@ -137,7 +123,7 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu,switch (op) {case DFU_OP_READ : - ret =fs_read (dfu->name, (size_t )buf,0 ,0 , &size); + ret =fs_read (dfu->name, (size_t )buf, offset,0 , &size);if (ret) {puts ("dfu: fs_read error!\n" );return ret;
@@ -145,7 +131,7 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, *len = size;break ;case DFU_OP_WRITE : - ret =fs_write (dfu->name, (size_t )buf,0 , *len, &size); + ret =fs_write (dfu->name, (size_t )buf, offset, *len, &size);if (ret) {puts ("dfu: fs_write error!\n" );return ret;
@@ -166,6 +152,30 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu,return ret; } +static int mmc_file_buf_write (struct dfu_entity *dfu,u64 offset,void *buf,long *len) +{ +if (dfu_file_buf_len + *len >CONFIG_SYS_DFU_MAX_FILE_SIZE ) { + dfu_file_buf_len =0 ; +return -EINVAL ; + } + +/* Add to the current buffer. */ +memcpy (dfu_file_buf + dfu_file_buf_len, buf, *len); + dfu_file_buf_len += *len; + +return 0 ; +} + +static int mmc_file_buf_write_finish (struct dfu_entity *dfu) +{ +int ret =mmc_file_op (DFU_OP_WRITE , dfu,0 , dfu_file_buf, + &dfu_file_buf_len); + +/* Now that we're done */ + dfu_file_buf_len =0 ; +return ret; +} +int dfu_write_medium_mmc (struct dfu_entity *dfu,u64 offset,void *buf,long *len) {
@@ -177,7 +187,7 @@ int dfu_write_medium_mmc(struct dfu_entity *dfu,break ;case DFU_FS_FAT :case DFU_FS_EXT4 : - ret =mmc_file_buffer (dfu, buf, len); + ret =mmc_file_buf_write (dfu, offset, buf, len);break ;default : printf("%s: Layout (%s) not (yet) supported!\n", __func__,
@@ -193,11 +203,7 @@ int dfu_flush_medium_mmc(struct dfu_entity *dfu)if (dfu->layout !=DFU_RAW_ADDR ) {/* Do stuff here. */ - ret =mmc_file_op (DFU_OP_WRITE , dfu, dfu_file_buf, - &dfu_file_buf_len); - -/* Now that we're done */ - dfu_file_buf_len =0 ; + ret =mmc_file_buf_write_finish (dfu); }return ret;
@@ -214,7 +220,7 @@ int dfu_get_medium_size_mmc(struct dfu_entity *dfu, u64 *size)case DFU_FS_FAT :case DFU_FS_EXT4 : dfu_file_buf_filled =-1 ; - ret =mmc_file_op (DFU_OP_SIZE , dfu,NULL , size); + ret =mmc_file_op (DFU_OP_SIZE , dfu,0 ,NULL , size);if (ret <0 )return ret;if (*size >CONFIG_SYS_DFU_MAX_FILE_SIZE )
@@ -227,14 +233,15 @@ int dfu_get_medium_size_mmc(struct dfu_entity *dfu, u64 *size) } } -static int mmc_file_unbuffer (struct dfu_entity *dfu,u64 offset,void *buf, + +static int mmc_file_buf_read (struct dfu_entity *dfu,u64 offset,void *buf,long *len) {int ret;u64 file_len;if (dfu_file_buf_filled ==-1 ) { - ret =mmc_file_op (DFU_OP_READ , dfu, dfu_file_buf, &file_len); + ret =mmc_file_op (DFU_OP_READ , dfu,0 , dfu_file_buf, &file_len);if (ret <0 )return ret; dfu_file_buf_filled = file_len;
@@ -259,7 +266,7 @@ int dfu_read_medium_mmc(struct dfu_entity *dfu, u64 offset, void *buf,break ;case DFU_FS_FAT :case DFU_FS_EXT4 : - ret =mmc_file_unbuffer (dfu, offset, buf, len); + ret =mmc_file_buf_read (dfu, offset, buf, len);break ;default : printf("%s: Layout (%s) not (yet) supported!\n", __func__,
Signature · 1 line
2.17.1
PATCH v2 3/6 dfu: mmc: rearrange the code
Hi Marek,
Quoted 5 lines
Rename functions for bufferred file io operations to make them easier to understand. Also add missing file offset argument to them (currently unused). All this is a preparation to remove predefined file size limit (
CONFIG_SYS_DFU_MAX_FILE_SIZE) for DFU read/write operations.
Quoted 144 lines
Signed-off-by Marek Szyprowski <[email protected]>--- drivers/dfu/dfu_mmc.c | 61++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 27 deletions(-)
drivers/dfu/dfu_mmc.c +3
-16@@ -91,22 +91,8 @@ static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu, return 0; } -static int mmc_file_buffer (struct dfu_entity *dfu,void *buf,long *len) -{ -if (dfu_file_buf_len + *len >CONFIG_SYS_DFU_MAX_FILE_SIZE ) { - dfu_file_buf_len =0 ; -return -EINVAL ; - } - -/* Add to the current buffer. */ -memcpy (dfu_file_buf + dfu_file_buf_len, buf, *len); - dfu_file_buf_len += *len; - -return 0 ; -} -static int mmc_file_op (enum dfu_op op,struct dfu_entity *dfu, -void *buf,u64 *len) +u64 offset,void *buf,u64 *len) {char dev_part_str[8 ];int ret;@@ -137,7 +123,7 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, switch (op) {case DFU_OP_READ : - ret =fs_read (dfu->name, (size_t )buf,0 ,0 , &size); + ret =fs_read (dfu->name, (size_t )buf, offset,0 , &size);if (ret) {puts ("dfu: fs_read error!\n" );return ret;@@ -145,7 +131,7 @@ static int mmc_file_op(enum dfu_op op, structdfu_entity *dfu, *len = size;break ;case DFU_OP_WRITE : - ret =fs_write (dfu->name, (size_t )buf,0 , *len, &size); + ret =fs_write (dfu->name, (size_t )buf, offset, *len, &size);if (ret) {puts ("dfu: fs_write error!\n" );drivers/dfu/dfu_mmc.c +24
-1return ret;@@ -166,6 +152,30 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, return ret; } +static int mmc_file_buf_write (struct dfu_entity *dfu,u64 offset, void *buf, long *len) +{ +if (dfu_file_buf_len + *len >CONFIG_SYS_DFU_MAX_FILE_SIZE ) { + dfu_file_buf_len =0 ; +return -EINVAL ; + } + +/* Add to the current buffer. */ +memcpy (dfu_file_buf + dfu_file_buf_len, buf, *len); + dfu_file_buf_len += *len; + +return 0 ; +} + +static int mmc_file_buf_write_finish (struct dfu_entity *dfu) +{ +int ret =mmc_file_op (DFU_OP_WRITE , dfu,0 , dfu_file_buf, + &dfu_file_buf_len); + +/* Now that we're done */ + dfu_file_buf_len =0 ; +return ret; +} +int dfu_write_medium_mmc (struct dfu_entity *dfu,u64 offset,void *buf,long *len) {@@ -177,7 +187,7 @@ int dfu_write_medium_mmc(struct dfu_entity *dfu,break ;case DFU_FS_FAT :case DFU_FS_EXT4 : - ret =mmc_file_buffer (dfu, buf, len); + ret =mmc_file_buf_write (dfu, offset, buf, len);break ;default : printf("%s: Layout (%s) not (yet) supported!\n",
__func__, @@ -193,11 +203,7 @@ intdfu_flush_medium_mmc(struct dfu_entity *dfu)drivers/dfu/dfu_mmc.c +2
-7if (dfu->layout !=DFU_RAW_ADDR ) {/* Do stuff here. */ - ret =mmc_file_op (DFU_OP_WRITE , dfu, dfu_file_buf, - &dfu_file_buf_len); - -/* Now that we're done */ - dfu_file_buf_len =0 ; + ret =mmc_file_buf_write_finish (dfu); }return ret;@@ -214,7 +220,7 @@ int dfu_get_medium_size_mmc(struct dfu_entity *dfu, u64 *size) case DFU_FS_FAT:case DFU_FS_EXT4 : dfu_file_buf_filled =-1 ; - ret =mmc_file_op (DFU_OP_SIZE , dfu,NULL , size); + ret =mmc_file_op (DFU_OP_SIZE , dfu,0 ,NULL , size);if (ret <0 )return ret;if (*size >CONFIG_SYS_DFU_MAX_FILE_SIZE )@@ -227,14 +233,15 @@ int dfu_get_medium_size_mmc(struct dfu_entity *dfu, u64 *size) } } -static int mmc_file_unbuffer(struct dfu_entity *dfu, u64 offset,void *buf, +
+static intmmc_file_buf_read(struct dfu_entity *dfu, u64 offset, void *buf, long *len)
{drivers/dfu/dfu_mmc.c +0
-1int ret;u64 file_len;if (dfu_file_buf_filled ==-1 ) { - ret = mmc_file_op(DFU_OP_READ, dfu, dfu_file_buf,
&file_len);drivers/dfu/dfu_mmc.c +1
-0+ ret = mmc_file_op(DFU_OP_READ, dfu, 0, dfu_file_buf,
&file_len); if (ret < 0)drivers/dfu/dfu_mmc.c +1
-1return ret; dfu_file_buf_filled = file_len;@@ -259,7 +266,7 @@ int dfu_read_medium_mmc(struct dfu_entity *dfu, u64 offset, void *buf, break;case DFU_FS_FAT :case DFU_FS_EXT4 : - ret =mmc_file_unbuffer (dfu, offset, buf, len); + ret =mmc_file_buf_read (dfu, offset, buf, len);break ;default : printf("%s: Layout (%s) not (yet) supported!\n",
Quoted 1 line
__func__,
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-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190924/cfaff96f/attachment.sig>
PATCH v2 4/6 dfu: mmc: remove file size limit for io operations
In reply to Marek SzyprowskiAdd support for operations on files larger than CONFIG_SYS_DFU_MAX_FILE_SIZE. The buffered io mechanism is still used for aggregating io requests, so for files up to CONFIG_SYS_DFU_MAX_FILE_SIZE nothing is changed and they will be handled in a single filesystem call.
--- drivers/dfu/dfu_mmc.c | 46 ++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 16 deletions(-)
drivers/dfu/dfu_mmc.c +30 -16
@@ -17,7 +17,7 @@static unsigned char *dfu_file_buf;static u64 dfu_file_buf_len; -static long dfu_file_buf_filled; +static u64 dfu_file_buf_offset;static int mmc_block_op (enum dfu_op op,struct dfu_entity *dfu,u64 offset,void *buf,long *len)
@@ -123,7 +123,7 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu,switch (op) {case DFU_OP_READ : - ret =fs_read (dfu->name, (size_t )buf, offset,0 , &size); + ret =fs_read (dfu->name, (size_t )buf, offset, *len, &size);if (ret) {puts ("dfu: fs_read error!\n" );return ret;
@@ -154,25 +154,38 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu,static int mmc_file_buf_write (struct dfu_entity *dfu,u64 offset,void *buf,long *len) { -if (dfu_file_buf_len + *len >CONFIG_SYS_DFU_MAX_FILE_SIZE ) { +int ret =0 ; + +if (offset ==0 ) { dfu_file_buf_len =0 ; -return -EINVAL ; + dfu_file_buf_offset =0 ; }/* Add to the current buffer. */ +if (dfu_file_buf_len + *len >CONFIG_SYS_DFU_MAX_FILE_SIZE ) + *len =CONFIG_SYS_DFU_MAX_FILE_SIZE - dfu_file_buf_len;memcpy (dfu_file_buf + dfu_file_buf_len, buf, *len); dfu_file_buf_len += *len; -return 0 ; +if (dfu_file_buf_len ==CONFIG_SYS_DFU_MAX_FILE_SIZE ) { + ret =mmc_file_op (DFU_OP_WRITE , dfu, dfu_file_buf_offset, + dfu_file_buf, &dfu_file_buf_len); + dfu_file_buf_offset += dfu_file_buf_len; + dfu_file_buf_len =0 ; + } + +return ret; }static int mmc_file_buf_write_finish (struct dfu_entity *dfu) { -int ret =mmc_file_op (DFU_OP_WRITE , dfu,0 , dfu_file_buf, - &dfu_file_buf_len); +int ret =mmc_file_op (DFU_OP_WRITE , dfu, dfu_file_buf_offset, + dfu_file_buf, &dfu_file_buf_len);/* Now that we're done */ dfu_file_buf_len =0 ; + dfu_file_buf_offset =0 ; +return ret; }
@@ -219,12 +232,9 @@ int dfu_get_medium_size_mmc(struct dfu_entity *dfu, u64 *size)return 0 ;case DFU_FS_FAT :case DFU_FS_EXT4 : - dfu_file_buf_filled =-1 ; ret =mmc_file_op (DFU_OP_SIZE , dfu,0 ,NULL , size);if (ret <0 )return ret; -if (*size >CONFIG_SYS_DFU_MAX_FILE_SIZE ) -return -1 ;return 0 ;default : printf("%s: Layout (%s) not (yet) supported!\n", __func__,
@@ -238,19 +248,23 @@ static int mmc_file_buf_read(struct dfu_entity *dfu, u64 offset, void *buf, long *len) {int ret; -u64 file_len; -if (dfu_file_buf_filled ==-1 ) { - ret =mmc_file_op (DFU_OP_READ , dfu,0 , dfu_file_buf, &file_len); +if (offset ==0 || offset >= dfu_file_buf_offset + dfu_file_buf_len || + offset + *len < dfu_file_buf_offset) { +u64 file_len =CONFIG_SYS_DFU_MAX_FILE_SIZE ; + + ret =mmc_file_op (DFU_OP_READ , dfu, offset, dfu_file_buf, + &file_len);if (ret <0 )return ret; - dfu_file_buf_filled = file_len; + dfu_file_buf_len = file_len; + dfu_file_buf_offset = offset; } -if (offset + *len > dfu_file_buf_filled) +if (offset + *len > dfu_file_buf_offset + dfu_file_buf_len)return -EINVAL ;/* Add to the current buffer. */ -memcpy (buf, dfu_file_buf + offset, *len); +memcpy (buf, dfu_file_buf + offset - dfu_file_buf_offset, *len);return 0 ; }
Signature · 1 line
2.17.1
PATCH v2 4/6 dfu: mmc: remove file size limit for io operations
Hi Marek,
Quoted 6 lines
Add support for operations on files larger than
CONFIG_SYS_DFU_MAX_FILE_SIZE. The buffered io mechanism is still used for aggregating io requests, so for files up toCONFIG_SYS_DFU_MAX_FILE_SIZEnothing is changed and they will be handled in a single filesystem call.
Quoted 117 lines
Signed-off-by Marek Szyprowski <[email protected]>--- drivers/dfu/dfu_mmc.c | 46++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 16 deletions(-)
drivers/dfu/dfu_mmc.c +2
-2@@ -17,7 +17,7 @@static unsigned char *dfu_file_buf;static u64 dfu_file_buf_len; -static long dfu_file_buf_filled; +static u64 dfu_file_buf_offset;static int mmc_block_op (enum dfu_op op,struct dfu_entity *dfu,u64 offset,void *buf,long *len)@@ -123,7 +123,7 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, switch (op) {case DFU_OP_READ : - ret =fs_read (dfu->name, (size_t )buf, offset,0 , &size); + ret =fs_read (dfu->name, (size_t )buf, offset, *len, &size);if (ret) {puts ("dfu: fs_read error!\n" );drivers/dfu/dfu_mmc.c +18
-8return ret;@@ -154,25 +154,38 @@ static int mmc_file_op(enum dfu_op op, structdfu_entity *dfu, static int mmc_file_buf_write(struct dfu_entity *dfu, u64 offset, void *buf, long *len) { - if (dfu_file_buf_len + *len > CONFIG_SYS_DFU_MAX_FILE_SIZE) { + int ret = 0; + +if (offset ==0 ) { dfu_file_buf_len =0 ; -return -EINVAL ; + dfu_file_buf_offset =0 ; }/* Add to the current buffer. */ +if (dfu_file_buf_len + *len >CONFIG_SYS_DFU_MAX_FILE_SIZE ) + *len =CONFIG_SYS_DFU_MAX_FILE_SIZE - dfu_file_buf_len;memcpy (dfu_file_buf + dfu_file_buf_len, buf, *len); dfu_file_buf_len += *len; -return 0 ; +if (dfu_file_buf_len ==CONFIG_SYS_DFU_MAX_FILE_SIZE ) { + ret =mmc_file_op (DFU_OP_WRITE , dfu, dfu_file_buf_offset, + dfu_file_buf, &dfu_file_buf_len); + dfu_file_buf_offset += dfu_file_buf_len; + dfu_file_buf_len =0 ; + } + +return ret; }static int mmc_file_buf_write_finish (struct dfu_entity *dfu) { -int ret =mmc_file_op (DFU_OP_WRITE , dfu,0 , dfu_file_buf, - &dfu_file_buf_len); +int ret =mmc_file_op (DFU_OP_WRITE , dfu, dfu_file_buf_offset, + dfu_file_buf, &dfu_file_buf_len);/* Now that we're done */ dfu_file_buf_len =0 ; + dfu_file_buf_offset =0 ; +return ret; }@@ -219,12 +232,9 @@ int dfu_get_medium_size_mmc(struct dfu_entity *dfu, u64 *size) return 0;case DFU_FS_FAT :case DFU_FS_EXT4 : - dfu_file_buf_filled =-1 ; ret =mmc_file_op (DFU_OP_SIZE , dfu,0 ,NULL , size);if (ret <0 )return ret; -if (*size >CONFIG_SYS_DFU_MAX_FILE_SIZE ) -return -1 ;return 0 ;default : printf("%s: Layout (%s) not (yet) supported!\n",
__func__, @@ -238,19 +248,23 @@ static intmmc_file_buf_read(struct dfu_entity *dfu, u64 offset, void *buf, long *len)
{drivers/dfu/dfu_mmc.c +0
-3int ret; -u64 file_len; -if (dfu_file_buf_filled ==-1 ) { - ret = mmc_file_op(DFU_OP_READ, dfu, 0, dfu_file_buf,
&file_len);drivers/dfu/dfu_mmc.c +1
-0+ if (offset == 0 || offset >= dfu_file_buf_offset +
dfu_file_buf_len||drivers/dfu/dfu_mmc.c +4
-0+ offset + *len < dfu_file_buf_offset) { +u64 file_len =CONFIG_SYS_DFU_MAX_FILE_SIZE ; + + ret = mmc_file_op(DFU_OP_READ, dfu, offset,
dfu_file_buf,drivers/dfu/dfu_mmc.c +5
-3+ &file_len);if (ret <0 )return ret; - dfu_file_buf_filled = file_len; + dfu_file_buf_len = file_len; + dfu_file_buf_offset = offset; } -if (offset + *len > dfu_file_buf_filled) +if (offset + *len > dfu_file_buf_offset + dfu_file_buf_len)return -EINVAL ;/* Add to the current buffer. */ -memcpy (buf, dfu_file_buf + offset, *len); + memcpy(buf, dfu_file_buf + offset - dfu_file_buf_offset,
Quoted 3 lines
*len);
return 0;
}
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-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190924/e169d231/attachment.sig>
PATCH v2 5/6 usb: dwc2_udc_otg: add bcm2835 SoC (Raspberry Pi4) support
In reply to Marek SzyprowskiBroadcom 2835 SoC requires special conversion of physical memory addresses for DMA purpose, so add needed wrappers to dwc2_udc_otg driver. Also extend the list of compatible devices with 'brcm,bcm2835-usb' entry. This allows to use USB gadget drivers (i.e. DFU) on Raspberry Pi4 boards.
--- drivers/usb/gadget/dwc2_udc_otg.c | 2 ++ drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-)
drivers/usb/gadget/dwc2_udc_otg.c +2 -0
@@ -31,6 +31,7 @@#include <linux/usb/otg.h> #include <linux/usb/gadget.h> +#include <phys2bus.h> #include <asm/byteorder.h> #include <asm/unaligned.h> #include <asm/io.h>
@@ -1213,6 +1214,7 @@ static int dwc2_udc_otg_remove(struct udevice *dev)static const struct udevice_id dwc2_udc_otg_ids[] = { { .compatible ="snps,dwc2" }, + { .compatible ="brcm,bcm2835-usb" }, { .compatible ="st,stm32mp1-hsotg" , .data = (ulong )dwc2_set_stm32mp1_hsotg_params }, {},
drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c +6 -6
@@ -28,7 +28,7 @@ static inline void dwc2_udc_ep0_zlp(struct dwc2_udc *dev) {u32 ep_ctrl; -writel (usb_ctrl_dma_addr, ®->in_endp[EP0_CON ].diepdma); +writel (phys_to_bus ((unsigned long )usb_ctrl_dma_addr), ®->in_endp[EP0_CON ].diepdma);writel (DIEPT_SIZ_PKT_CNT (1 ), ®->in_endp[EP0_CON ].dieptsiz); ep_ctrl =readl (®->in_endp[EP0_CON ].diepctl);
@@ -49,7 +49,7 @@ static void dwc2_udc_pre_setup(void)writel (DOEPT_SIZ_PKT_CNT (1 ) |sizeof (struct usb_ctrlrequest ), ®->out_endp[EP0_CON ].doeptsiz); -writel (usb_ctrl_dma_addr, ®->out_endp[EP0_CON ].doepdma); +writel (phys_to_bus ((unsigned long )usb_ctrl_dma_addr), ®->out_endp[EP0_CON ].doepdma); ep_ctrl =readl (®->out_endp[EP0_CON ].doepctl);writel (ep_ctrl|DEPCTL_EPENA , ®->out_endp[EP0_CON ].doepctl);
@@ -75,7 +75,7 @@ static inline void dwc2_ep0_complete_out(void)writel (DOEPT_SIZ_PKT_CNT (1 ) |sizeof (struct usb_ctrlrequest ), ®->out_endp[EP0_CON ].doeptsiz); -writel (usb_ctrl_dma_addr, ®->out_endp[EP0_CON ].doepdma); +writel (phys_to_bus ((unsigned long )usb_ctrl_dma_addr), ®->out_endp[EP0_CON ].doepdma); ep_ctrl =readl (®->out_endp[EP0_CON ].doepctl); writel(ep_ctrl|DEPCTL_EPENA|DEPCTL_CNAK,
@@ -113,7 +113,7 @@ static int setdma_rx(struct dwc2_ep *ep, struct dwc2_request *req) (unsigned long ) ep->dma_buf + ROUND(ep->len, CONFIG_SYS_CACHELINE_SIZE)); -writel ((unsigned long ) ep->dma_buf, ®->out_endp[ep_num].doepdma); +writel (phys_to_bus ((unsigned long )ep->dma_buf), ®->out_endp[ep_num].doepdma);writel (DOEPT_SIZ_PKT_CNT (pktcnt) |DOEPT_SIZ_XFER_SIZE (length), ®->out_endp[ep_num].doeptsiz);writel (DEPCTL_EPENA |DEPCTL_CNAK |ctrl, ®->out_endp[ep_num].doepctl);
@@ -161,7 +161,7 @@ static int setdma_tx(struct dwc2_ep *ep, struct dwc2_request *req)while (readl (®->grstctl) &TX_FIFO_FLUSH ) ; -writel ((unsigned long ) ep->dma_buf, ®->in_endp[ep_num].diepdma); +writel (phys_to_bus ((unsigned long )ep->dma_buf), ®->in_endp[ep_num].diepdma);writel (DIEPT_SIZ_PKT_CNT (pktcnt) |DIEPT_SIZ_XFER_SIZE (length), ®->in_endp[ep_num].dieptsiz);
@@ -921,7 +921,7 @@ static int dwc2_udc_get_status(struct dwc2_udc *dev, (unsigned long ) usb_ctrl + ROUND(sizeof(g_status), CONFIG_SYS_CACHELINE_SIZE)); -writel (usb_ctrl_dma_addr, ®->in_endp[EP0_CON ].diepdma); +writel (phys_to_bus (usb_ctrl_dma_addr), ®->in_endp[EP0_CON ].diepdma);writel (DIEPT_SIZ_PKT_CNT (1 ) |DIEPT_SIZ_XFER_SIZE (2 ), ®->in_endp[EP0_CON ].dieptsiz);
Signature · 1 line
2.17.1
PATCH v2 6/6 config: enable DFU over USB on Raspberry Pi4 boards
In reply to Marek SzyprowskiEnable support for DFU over USB. This requires to enable USB gadget, DWC2 UDC OTG driver and DFU command. DFU entities are defined for the following firmware objects: u-boot.bin, uboot.env, config.txt, cmdline.txt and zImage/Image.gz.
--- configs/rpi_4_32b_defconfig | 11 +++++++++++ configs/rpi_4_defconfig | 11 +++++++++++ include/configs/rpi.h | 17 +++++++++++++++++ 3 files changed, 39 insertions(+)
configs/rpi_4_32b_defconfig +11 -0
@@ -12,6 +12,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y
@@ -19,6 +20,7 @@ CONFIG_CMD_FS_UUID=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y
@@ -26,6 +28,15 @@ CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10
configs/rpi_4_defconfig +11 -0
@@ -12,6 +12,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y
@@ -19,6 +20,7 @@ CONFIG_CMD_FS_UUID=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y
@@ -26,6 +28,15 @@ CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10
include/configs/rpi.h +17 -0
@@ -70,6 +70,22 @@#define CONFIG_TFTP_TSIZE #endif +/* DFU over USB/UDC */ +#ifdef CONFIG_CMD_DFU +#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_1M +#define CONFIG_SYS_DFU_MAX_FILE_SIZE SZ_2M + +#ifdef CONFIG_ARM64 +#define KERNEL_FILENAME "Image.gz" +#else +#define KERNEL_FILENAME "zImage" +#endif +#define ENV_DFU_SETTINGS \ + "dfu_alt_info=u-boot.bin fat 0 1;uboot.env fat 0 1;" \ + "config.txt fat 0 1;cmdline.txt fat 0 1;" \ + KERNEL_FILENAME " fat 0 1\0" +#endif +/* Console configuration */ #define CONFIG_SYS_CBSIZE 1024
@@ -185,6 +201,7 @@#define CONFIG_EXTRA_ENV_SETTINGS \ "dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \ ENV_DEVICE_SETTINGS \ + ENV_DFU_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV
Signature · 1 line
2.17.1
PATCH v2 6/6 config: enable DFU over USB on Raspberry Pi4 boards
Hi Marek,
First of all thanks for the patch and sorry for the late response.
Quoted 99 lines · Marek Szyprowski
Enable support for DFU over USB. This requires to enable USB gadget, DWC2 UDC OTG driver and DFU command. DFU entities are defined for the following firmware objects: u-boot.bin, uboot.env, config.txt, cmdline.txt and zImage/Image.gz.
Signed-off-by Marek Szyprowski <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>--- configs/rpi_4_32b_defconfig | 11 +++++++++++ configs/rpi_4_defconfig | 11 +++++++++++ include/configs/rpi.h | 17 +++++++++++++++++ 3 files changed, 39 insertions(+)configs/rpi_4_32b_defconfig +11
-0@@ -12,6 +12,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y@@ -19,6 +20,7 @@ CONFIG_CMD_FS_UUID=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y@@ -26,6 +28,15 @@ CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10configs/rpi_4_defconfig +11
-0@@ -12,6 +12,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y@@ -19,6 +20,7 @@ CONFIG_CMD_FS_UUID=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y@@ -26,6 +28,15 @@ CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10include/configs/rpi.h +6
-0@@ -70,6 +70,22 @@#define CONFIG_TFTP_TSIZE #endif +/* DFU over USB/UDC */ +#ifdef CONFIG_CMD_DFU +#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_1M +#define CONFIG_SYS_DFU_MAX_FILE_SIZE SZ_2M + +#ifdef CONFIG_ARM64
include/configs/rpi.h line 88
Quoted 10 lines
include/configs/rpi.h +10
-0+#define KERNEL_FILENAME "Image.gz" +#else +#define KERNEL_FILENAME "zImage" +#endif +#define ENV_DFU_SETTINGS \ + "dfu_alt_info=u-boot.bin fat 0 1;uboot.env fat 0 1;" \ + "config.txt fat 0 1;cmdline.txt fat 0 1;" \ + KERNEL_FILENAME " fat 0 1\0" +#endif +
I'm hesitant to take this file list as I think it highly depends on what you want to do with the board. For example at SUSE we use a ubootconfig.txt which get's added to config.txt. We might want to update grub, our kernel is on a different partition etc.
What do you think?
Other then that the patches look good, and I understand that they should go through my tree, also I don't know much about the FAT implementation.
Regards,
Matthias
PATCH v2 6/6 config: enable DFU over USB on Raspberry Pi4 boards
Quoted 99 lines · Matthias Brugger
Hi Marek,
First of all thanks for the patch and sorry for the late response.
Quoted 93 lines · Marek Szyprowski
Enable support for DFU over USB. This requires to enable USB gadget, DWC2 UDC OTG driver and DFU command. DFU entities are defined for the following firmware objects: u-boot.bin, uboot.env, config.txt, cmdline.txt and zImage/Image.gz.
Signed-off-by Marek Szyprowski <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>--- configs/rpi_4_32b_defconfig | 11 +++++++++++ configs/rpi_4_defconfig | 11 +++++++++++ include/configs/rpi.h | 17 +++++++++++++++++ 3 files changed, 39 insertions(+)configs/rpi_4_32b_defconfig +11
-0@@ -12,6 +12,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y@@ -19,6 +20,7 @@ CONFIG_CMD_FS_UUID=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y@@ -26,6 +28,15 @@ CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10configs/rpi_4_defconfig +11
-0@@ -12,6 +12,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y@@ -19,6 +20,7 @@ CONFIG_CMD_FS_UUID=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y@@ -26,6 +28,15 @@ CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10include/configs/rpi.h +0
-0@@ -70,6 +70,22 @@#define CONFIG_TFTP_TSIZE #endif
Quoted 14 lines
Quoted 4 lines
include/configs/rpi.h +4
-0+/* DFU over USB/UDC */ +#ifdef CONFIG_CMD_DFU +#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_1M +#define CONFIG_SYS_DFU_MAX_FILE_SIZE SZ_2Minclude/configs/rpi.h line 86
Quoted 10 lines
include/configs/rpi.h +10
-0+ +#ifdef CONFIG_ARM64 +#define KERNEL_FILENAME "Image.gz" +#else +#define KERNEL_FILENAME "zImage" +#endif +#define ENV_DFU_SETTINGS \ + "dfu_alt_info=u-boot.bin fat 0 1;uboot.env fat 0 1;" \ + "config.txt fat 0 1;cmdline.txt fat 0 1;" \ + KERNEL_FILENAME " fat 0 1\0"
we are missing
#else
#define ENV_DFU_SETTINGS ""
otherwise armv7 builds are broken.
Regards,
Matthias
Quoted 16 lines
include/configs/rpi.h line 88
Quoted 2 lines
include/configs/rpi.h +2
-0+#endif +I'm hesitant to take this file list as I think it highly depends on what you want to do with the board. For example at SUSE we use a ubootconfig.txt which get's added to config.txt. We might want to update grub, our kernel is on a different partition etc.
What do you think?
Other then that the patches look good, and I understand that they should go through my tree, also I don't know much about the FAT implementation.
Regards,
Matthias
PATCH v2 6/6 config: enable DFU over USB on Raspberry Pi4 boards
In reply to Matthias BruggerHi Matthias,
Quoted 117 lines · Matthias Brugger
First of all thanks for the patch and sorry for the late response.
Quoted 99 lines · Marek Szyprowski
Enable support for DFU over USB. This requires to enable USB gadget, DWC2 UDC OTG driver and DFU command. DFU entities are defined for the following firmware objects: u-boot.bin, uboot.env, config.txt, cmdline.txt and zImage/Image.gz.
Signed-off-by Marek Szyprowski <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>--- configs/rpi_4_32b_defconfig | 11 +++++++++++ configs/rpi_4_defconfig | 11 +++++++++++ include/configs/rpi.h | 17 +++++++++++++++++ 3 files changed, 39 insertions(+)configs/rpi_4_32b_defconfig +11
-0@@ -12,6 +12,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y@@ -19,6 +20,7 @@ CONFIG_CMD_FS_UUID=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y@@ -26,6 +28,15 @@ CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10configs/rpi_4_defconfig +11
-0@@ -12,6 +12,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y@@ -19,6 +20,7 @@ CONFIG_CMD_FS_UUID=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y@@ -26,6 +28,15 @@ CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10include/configs/rpi.h +6
-0@@ -70,6 +70,22 @@#define CONFIG_TFTP_TSIZE #endif +/* DFU over USB/UDC */ +#ifdef CONFIG_CMD_DFU +#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_1M +#define CONFIG_SYS_DFU_MAX_FILE_SIZE SZ_2M + +#ifdef CONFIG_ARM64 include/configs/rpi.h line 88
Quoted 10 lines
include/configs/rpi.h +10
-0+#define KERNEL_FILENAME "Image.gz" +#else +#define KERNEL_FILENAME "zImage" +#endif +#define ENV_DFU_SETTINGS \ + "dfu_alt_info=u-boot.bin fat 0 1;uboot.env fat 0 1;" \ + "config.txt fat 0 1;cmdline.txt fat 0 1;" \ + KERNEL_FILENAME " fat 0 1\0" +#endif +I'm hesitant to take this file list as I think it highly depends on what you want to do with the board. For example at SUSE we use a ubootconfig.txt which get's added to config.txt. We might want to update grub, our kernel is on a different partition etc.
Quoted 1 line
What do you think?
Well, the above list is just a proposal. IMHO distro maintainers should adjust it for their needs. I can add a comment about that if you want.
Quoted 2 lines
Other then that the patches look good, and I understand that they should go through my tree, also I don't know much about the FAT implementation.
Merging everything via a single tree will be the easiest way to handle the runtime dependencies.
Best regards
Signature · 2 lines
Marek Szyprowski, PhD Samsung R&D Institute Poland
PATCH v2 6/6 config: enable DFU over USB on Raspberry Pi4 boards
Quoted 120 lines · Marek Szyprowski
Hi Matthias,
Quoted 117 lines · Matthias Brugger
First of all thanks for the patch and sorry for the late response.
Quoted 99 lines · Marek Szyprowski
Enable support for DFU over USB. This requires to enable USB gadget, DWC2 UDC OTG driver and DFU command. DFU entities are defined for the following firmware objects: u-boot.bin, uboot.env, config.txt, cmdline.txt and zImage/Image.gz.
Signed-off-by Marek Szyprowski <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>--- configs/rpi_4_32b_defconfig | 11 +++++++++++ configs/rpi_4_defconfig | 11 +++++++++++ include/configs/rpi.h | 17 +++++++++++++++++ 3 files changed, 39 insertions(+)configs/rpi_4_32b_defconfig +11
-0@@ -12,6 +12,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y@@ -19,6 +20,7 @@ CONFIG_CMD_FS_UUID=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y@@ -26,6 +28,15 @@ CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10configs/rpi_4_defconfig +11
-0@@ -12,6 +12,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y@@ -19,6 +20,7 @@ CONFIG_CMD_FS_UUID=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y@@ -26,6 +28,15 @@ CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10include/configs/rpi.h +6
-0@@ -70,6 +70,22 @@#define CONFIG_TFTP_TSIZE #endif +/* DFU over USB/UDC */ +#ifdef CONFIG_CMD_DFU +#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_1M +#define CONFIG_SYS_DFU_MAX_FILE_SIZE SZ_2M + +#ifdef CONFIG_ARM64 include/configs/rpi.h line 88
Quoted 10 lines
include/configs/rpi.h +10
-0+#define KERNEL_FILENAME "Image.gz" +#else +#define KERNEL_FILENAME "zImage" +#endif +#define ENV_DFU_SETTINGS \ + "dfu_alt_info=u-boot.bin fat 0 1;uboot.env fat 0 1;" \ + "config.txt fat 0 1;cmdline.txt fat 0 1;" \ + KERNEL_FILENAME " fat 0 1\0" +#endif +I'm hesitant to take this file list as I think it highly depends on what you want to do with the board. For example at SUSE we use a ubootconfig.txt which get's added to config.txt. We might want to update grub, our kernel is on a different partition etc.
Quoted 5 lines
Quoted 1 line
What do you think?
Well, the above list is just a proposal. IMHO distro maintainers should adjust it for their needs. I can add a comment about that if you want.
Ok, if you send a v3, then I'd propose to delete cmdline.txt as it is not part of U-Boot infrastructure.
Can please also fix the armv7 build as mentioned in my mail yesterday.
Quoted 6 lines
Quoted 2 lines
Other then that the patches look good, and I understand that they should go through my tree, also I don't know much about the FAT implementation.
Merging everything via a single tree will be the easiest way to handle the runtime dependencies.
Ok, will do with you v3.
Regrads,
Matthias
PATCH v3 6/6 config: enable DFU over USB on Raspberry Pi4 boards
Enable support for DFU over USB. This requires to enable USB gadget, DWC2 UDC OTG driver and DFU command. DFU entities are defined for the following firmware objects: u-boot.bin, uboot.env, config.txt and zImage/Image.
---
Changelog:
v3:
- fixed non-RPi4 builds (missing #else ENV_DFU_SETTINGS def)
- removed config.txt entity (not needed in uboot-based boot)
- switched arm64 kernel filename to 'Image'
--- configs/rpi_4_32b_defconfig | 11 +++++++++++ configs/rpi_4_defconfig | 11 +++++++++++ include/configs/rpi.h | 20 ++++++++++++++++++++ 3 files changed, 42 insertions(+)
configs/rpi_4_32b_defconfig +11 -0
@@ -11,6 +11,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y
@@ -19,6 +20,7 @@ CONFIG_OF_BOARD=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y
@@ -26,6 +28,15 @@ CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10
configs/rpi_4_defconfig +11 -0
@@ -11,6 +11,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y
@@ -19,6 +20,7 @@ CONFIG_OF_BOARD=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y
@@ -26,6 +28,15 @@ CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10
include/configs/rpi.h +20 -0
@@ -70,6 +70,25 @@#define CONFIG_TFTP_TSIZE #endif +/* DFU over USB/UDC */ +#ifdef CONFIG_CMD_DFU +#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_1M +#define CONFIG_SYS_DFU_MAX_FILE_SIZE SZ_2M + +#ifdef CONFIG_ARM64 +#define KERNEL_FILENAME "Image" +#else +#define KERNEL_FILENAME "zImage" +#endif + +#define ENV_DFU_SETTINGS \ + "dfu_alt_info=u-boot.bin fat 0 1;uboot.env fat 0 1;" \ + "config.txt fat 0 1;" \ + KERNEL_FILENAME " fat 0 1\0" +#else +#define ENV_DFU_SETTINGS "" +#endif +/* Console configuration */ #define CONFIG_SYS_CBSIZE 1024
@@ -185,6 +204,7 @@#define CONFIG_EXTRA_ENV_SETTINGS \ "dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \ ENV_DEVICE_SETTINGS \ + ENV_DFU_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV
Signature · 1 line
2.17.1
PATCH v3 6/6 config: enable DFU over USB on Raspberry Pi4 boards
Quoted 7 lines · Marek Szyprowski
Enable support for DFU over USB. This requires to enable USB gadget, DWC2 UDC OTG driver and DFU command. DFU entities are defined for the following firmware objects: u-boot.bin, uboot.env, config.txt and zImage/Image.
Signed-off-by Marek Szyprowski <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>
Looks good, I submitted the whole series for inclusion in v2020.01
Regards,
Matthias
Quoted 123 lines
---
Changelog:
v3:
- fixed non-RPi4 builds (missing #elseENV_DFU_SETTINGSdef)
- removed config.txt entity (not needed in uboot-based boot)
- switched arm64 kernel filename to 'Image'--- configs/rpi_4_32b_defconfig | 11 +++++++++++ configs/rpi_4_defconfig | 11 +++++++++++ include/configs/rpi.h | 20 ++++++++++++++++++++ 3 files changed, 42 insertions(+)configs/rpi_4_32b_defconfig +11
-0@@ -11,6 +11,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y@@ -19,6 +20,7 @@ CONFIG_OF_BOARD=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y@@ -26,6 +28,15 @@ CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10configs/rpi_4_defconfig +11
-0@@ -11,6 +11,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y@@ -19,6 +20,7 @@ CONFIG_OF_BOARD=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DFU_MMC=y CONFIG_DM_KEYBOARD=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y@@ -26,6 +28,15 @@ CONFIG_MMC_SDHCI_BCM2835=y CONFIG_PINCTRL=y # CONFIG_PINCTRL_GENERIC is not set # CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10include/configs/rpi.h +20
-0@@ -70,6 +70,25 @@#define CONFIG_TFTP_TSIZE #endif +/* DFU over USB/UDC */ +#ifdef CONFIG_CMD_DFU +#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_1M +#define CONFIG_SYS_DFU_MAX_FILE_SIZE SZ_2M + +#ifdef CONFIG_ARM64 +#define KERNEL_FILENAME "Image" +#else +#define KERNEL_FILENAME "zImage" +#endif + +#define ENV_DFU_SETTINGS \ + "dfu_alt_info=u-boot.bin fat 0 1;uboot.env fat 0 1;" \ + "config.txt fat 0 1;" \ + KERNEL_FILENAME " fat 0 1\0" +#else +#define ENV_DFU_SETTINGS "" +#endif +/* Console configuration */ #define CONFIG_SYS_CBSIZE 1024@@ -185,6 +204,7 @@#define CONFIG_EXTRA_ENV_SETTINGS \ "dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \ ENV_DEVICE_SETTINGS \ + ENV_DFU_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV