Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-13 00:17:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-usb

Browse source 
- DFU and Cadence USB 3 fixes
This commit is contained in:
Tom Rini 2020-02-02 15:26:53 -05:00
commit 31a790bee9
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/dfu/Kconfig
View file

@ -42,6 +42,13 @@ config DFU_NAND
This option enables using DFU to read and write to NAND based This option enables using DFU to read and write to NAND based
storage. storage.
config DFU_NAND_TRIMFFS
bool "Skip empty pages when flashing UBI images to NAND"
depends on DFU_NAND
help
When flashing UBI images to NAND, enable the DROP_FFS flag to drop
trailing all-0xff pages.
config DFU_RAM config DFU_RAM
bool "RAM back end for DFU" bool "RAM back end for DFU"
help help

7
drivers/dfu/dfu_nand.c
View file

@ -50,6 +50,7 @@ static int nand_block_op(enum dfu_op op, struct dfu_entity *dfu,
lim, buf); lim, buf);
} else { } else {
nand_erase_options_t opts; nand_erase_options_t opts;
int write_flags = WITH_WR_VERIFY;
memset(&opts, 0, sizeof(opts)); memset(&opts, 0, sizeof(opts));
opts.offset = start; opts.offset = start;
@ -62,8 +63,12 @@ static int nand_block_op(enum dfu_op op, struct dfu_entity *dfu,
if (ret) if (ret)
return ret; return ret;
/* then write */ /* then write */
#ifdef CONFIG_DFU_NAND_TRIMFFS
if (dfu->data.nand.ubi)
write_flags |= WITH_DROP_FFS;
#endif
ret = nand_write_skip_bad(mtd, start, &count, &actual, ret = nand_write_skip_bad(mtd, start, &count, &actual,
lim, buf, WITH_WR_VERIFY); lim, buf, write_flags);
} }
if (ret != 0) { if (ret != 0) {

4
drivers/usb/cdns3/ep0.c
View file

@ -562,6 +562,10 @@ static void cdns3_ep0_setup_phase(struct cdns3_device *priv_dev)
struct cdns3_endpoint *priv_ep = priv_dev->eps[0]; struct cdns3_endpoint *priv_ep = priv_dev->eps[0];
int result; int result;
/* Invalidate Setup Packet received */
invalidate_dcache_range(priv_dev->setup_dma,
priv_dev->setup_dma + ARCH_DMA_MINALIGN);
priv_dev->ep0_data_dir = ctrl->bRequestType & USB_DIR_IN; priv_dev->ep0_data_dir = ctrl->bRequestType & USB_DIR_IN;
trace_cdns3_ctrl_req(ctrl); trace_cdns3_ctrl_req(ctrl);