June 2016 - U-Boot

[U-Boot] [PATCH] Revert "image.h: Tighten up content using handy CONFIG_IS_ENABLED() macro."
by Masahiro Yamada 01 Jun '16

01 Jun '16

This reverts commit 56adbb38727320375b2f695bd04600d766d8a1b3. Since commit 56adbb387273 ("image.h: Tighten up content using handy CONFIG_IS_ENABLED() macro."), I found my boards fail to boot Linux because the commit changed the logic of macros it touched. Now, IMAGE_ENABLE_RAMDISK_HIGH and IMAGE_BOOT_GET_CMDLINE are 0 for all the boards. As you can see in include/linux/kconfig.h, CONFIG_IS_ENABLE() (and IS_ENABLED() as well) can only take a macro that is either defined as 1 or undefined. This is met for boolean options defined in Kconfig. On the other hand, CONFIG_SYS_BOOT_RAMDISK_HIGH and CONFIG_SYS_BOOT_GET_CMDLINE are defined without any value in arch/*/include/asm/config.h . This kind of clean-up is welcome, but the options should be moved to Kconfig beforehand. Moreover, CONFIG_IS_ENABLED(SPL_CRC32_SUPPORT) looks weird. It should be either CONFIG_IS_ENABLED(CRC32_SUPPORT) or IS_ENABLED(CONFIG_SPL_CRC32_SUPPORT). But, I see no define for CONFIG_SPL_CRC32_SUPPORT anywhere. Likewise for the other three. The logic of IMAGE_OF_BOARD_SETUP and IMAGE_OF_SYSTEM_SETUP were also changed for SPL. This can be a problem for boards defining CONFIG_SPL_OF_LIBFDT. I guess it should have been changed to IS_ENABLED(CONFIG_OF_BOARD_SETUP). In the first place, if we replace the references in C code, the macros IMAGE_* will go away. if (IS_ENABLED(CONFIG_OF_BOARD_SETUP) { ... } Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- include/image.h | 69 +++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 12 deletions(-) diff --git a/include/image.h b/include/image.h index 80a4454..a8f6bd1 100644 --- a/include/image.h +++ b/include/image.h @@ -52,15 +52,19 @@ struct lmb; #include <hash.h> #include <libfdt.h> #include <fdt_support.h> -# ifdef CONFIG_FIT_DISABLE_SHA256 -# undef CONFIG_SHA256 -# undef IMAGE_ENABLE_SHA256 -# endif # ifdef CONFIG_SPL_BUILD -# define IMAGE_ENABLE_CRC32 CONFIG_IS_ENABLED(SPL_CRC32_SUPPORT) -# define IMAGE_ENABLE_MD5 CONFIG_IS_ENABLED(SPL_MD5_SUPPORT) -# define IMAGE_ENABLE_SHA1 CONFIG_IS_ENABLED(SPL_SHA1_SUPPORT) -# define IMAGE_ENABLE_SHA256 CONFIG_IS_ENABLED(SPL_SHA256_SUPPORT) +# ifdef CONFIG_SPL_CRC32_SUPPORT +# define IMAGE_ENABLE_CRC32 1 +# endif +# ifdef CONFIG_SPL_MD5_SUPPORT +# define IMAGE_ENABLE_MD5 1 +# endif +# ifdef CONFIG_SPL_SHA1_SUPPORT +# define IMAGE_ENABLE_SHA1 1 +# endif +# ifdef CONFIG_SPL_SHA256_SUPPORT +# define IMAGE_ENABLE_SHA256 1 +# endif # else # define CONFIG_CRC32 /* FIT images need CRC32 support */ # define CONFIG_MD5 /* and MD5 */ @@ -71,12 +75,53 @@ struct lmb; # define IMAGE_ENABLE_SHA1 1 # define IMAGE_ENABLE_SHA256 1 # endif + +#ifdef CONFIG_FIT_DISABLE_SHA256 +#undef CONFIG_SHA256 +#undef IMAGE_ENABLE_SHA256 +#endif + +#ifndef IMAGE_ENABLE_CRC32 +#define IMAGE_ENABLE_CRC32 0 +#endif + +#ifndef IMAGE_ENABLE_MD5 +#define IMAGE_ENABLE_MD5 0 +#endif + +#ifndef IMAGE_ENABLE_SHA1 +#define IMAGE_ENABLE_SHA1 0 +#endif + +#ifndef IMAGE_ENABLE_SHA256 +#define IMAGE_ENABLE_SHA256 0 +#endif + #endif /* IMAGE_ENABLE_FIT */ -#define IMAGE_ENABLE_RAMDISK_HIGH CONFIG_IS_ENABLED(SYS_BOOT_RAMDISK_HIGH) -#define IMAGE_BOOT_GET_CMDLINE CONFIG_IS_ENABLED(SYS_BOOT_GET_CMDLINE) -#define IMAGE_OF_BOARD_SETUP CONFIG_IS_ENABLED(OF_BOARD_SETUP) -#define IMAGE_OF_SYSTEM_SETUP CONFIG_IS_ENABLED(OF_SYSTEM_SETUP) +#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH +# define IMAGE_ENABLE_RAMDISK_HIGH 1 +#else +# define IMAGE_ENABLE_RAMDISK_HIGH 0 +#endif + +#ifdef CONFIG_SYS_BOOT_GET_CMDLINE +# define IMAGE_BOOT_GET_CMDLINE 1 +#else +# define IMAGE_BOOT_GET_CMDLINE 0 +#endif + +#ifdef CONFIG_OF_BOARD_SETUP +# define IMAGE_OF_BOARD_SETUP 1 +#else +# define IMAGE_OF_BOARD_SETUP 0 +#endif + +#ifdef CONFIG_OF_SYSTEM_SETUP +# define IMAGE_OF_SYSTEM_SETUP 1 +#else +# define IMAGE_OF_SYSTEM_SETUP 0 +#endif /* * Operating System Codes -- 1.9.1

3 4

[U-Boot] [PATCH v2] splash_source: add support for ubifs formatted nand
by Eran Matityahu 01 Jun '16

01 Jun '16

Add support for loading splash image from NAND Flash formatted with a (UBI) filesystem. Signed-off-by: Eran Matityahu <eran.m(a)variscite.com> Cc: Igor Grinberg <grinberg(a)compulab.co.il> Cc: Tom Rini <trini(a)konsulko.com> Cc: Nikita Kiryanov <nikita(a)compulab.co.il> Cc: Stefano Babic <sbabic(a)denx.de> --- Changes for v2: - Following Nikita's comments: - Use the ubi volume field to identify the UBIFS usage - Changed FS_TYPE_ANY to FS_TYPE_UBIFS - Added a second definition of splash_umount_ubifs ifndef CONFIG_CMD_UBIFS - Replace license identifier to GPL-2.0+ in include/splash.h - Changed ubi_volume to ubivol common/splash_source.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++---- include/splash.h | 23 +++++--------------- 2 files changed, 60 insertions(+), 22 deletions(-) diff --git a/common/splash_source.c b/common/splash_source.c index a09dd4b..e132a82 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -120,6 +120,12 @@ static int splash_select_fs_dev(struct splash_location *location) case SPLASH_STORAGE_SATA: res = fs_set_blk_dev("sata", location->devpart, FS_TYPE_ANY); break; + case SPLASH_STORAGE_NAND: + if (location->ubivol != NULL) + res = fs_set_blk_dev("ubi", NULL, FS_TYPE_UBIFS); + else + res = -ENODEV; + break; default: printf("Error: unsupported location storage.\n"); return -ENODEV; @@ -163,6 +169,41 @@ static inline int splash_init_sata(void) } #endif +#ifdef CONFIG_CMD_UBIFS +static int splash_mount_ubifs(struct splash_location *location) +{ + int res; + char cmd[32]; + + sprintf(cmd, "ubi part %s", location->mtdpart); + res = run_command(cmd, 0); + if (res) + return res; + + sprintf(cmd, "ubifsmount %s", location->ubivol); + res = run_command(cmd, 0); + + return res; +} + +static inline int splash_umount_ubifs(void) +{ + return run_command("ubifsumount", 0); +} +#else +static inline int splash_mount_ubifs(struct splash_location *location) +{ + printf("Cannot load splash image: no UBIFS support\n"); + return -ENOSYS; +} + +static inline int splash_umount_ubifs(void) +{ + printf("Cannot unmount UBIFS: no UBIFS support\n"); + return -ENOSYS; +} +#endif + #define SPLASH_SOURCE_DEFAULT_FILE_NAME "splash.bmp" static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr) @@ -181,26 +222,36 @@ static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr) if (location->storage == SPLASH_STORAGE_SATA) res = splash_init_sata(); + if (location->ubivol != NULL) + res = splash_mount_ubifs(location); + if (res) return res; res = splash_select_fs_dev(location); if (res) - return res; + goto out; res = fs_size(splash_file, &bmp_size); if (res) { printf("Error (%d): cannot determine file size\n", res); - return res; + goto out; } if (bmp_load_addr + bmp_size >= gd->start_addr_sp) { printf("Error: splashimage address too high. Data overwrites U-Boot and/or placed beyond DRAM boundaries.\n"); - return -EFAULT; + res = -EFAULT; + goto out; } splash_select_fs_dev(location); - return fs_read(splash_file, bmp_load_addr, 0, 0, NULL); + res = fs_read(splash_file, bmp_load_addr, 0, 0, NULL); + +out: + if (location->ubivol != NULL) + splash_umount_ubifs(); + + return res; } /** diff --git a/include/splash.h b/include/splash.h index f0755ca..617b514 100644 --- a/include/splash.h +++ b/include/splash.h @@ -1,22 +1,7 @@ /* * Copyright (C) 2013, Boundary Devices <info(a)boundarydevices.com> * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., http://www.fsf.org/about/contact/ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _SPLASH_H_ @@ -41,8 +26,10 @@ struct splash_location { char *name; enum splash_storage storage; enum splash_flags flags; - u32 offset; /* offset from start of storage */ - char *devpart; /* Use the load command dev:part conventions */ + u32 offset; /* Offset from start of storage */ + char *devpart; /* Use the load command dev:part conventions */ + char *mtdpart; /* MTD partition for ubi part */ + char *ubivol; /* UBI volume-name for ubifsmount */ }; int splash_source_load(struct splash_location *locations, uint size); -- 1.9.1

2 1

[U-Boot] [PATCH] ARM64: zynqmp: Enable support for SPL FIT images
by Michal Simek 01 Jun '16

01 Jun '16

Enable support for RAM based FIT images read by SPL. Empty function for now to keep compiler happy. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/xilinx_zynqmp_ep_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + configs/xilinx_zynqmp_zcu102_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + 7 files changed, 7 insertions(+) diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index 7879b4dd6c49..facb3b05ed66 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep108" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_CONSOLE is not set diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig index 5d641a57bd50..1941653c9d8a 100644 --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig @@ -8,6 +8,7 @@ CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm015-dc1" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_IMLS is not set diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig index 67d36f3a08f9..4f3cd9343b56 100644 --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig @@ -8,6 +8,7 @@ CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm016-dc2" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_IMLS is not set diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig index f7f3822d6999..c7f58bae06f0 100644 --- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm018-dc4" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_IMLS is not set diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig index f7c671b859e3..59c754a38fcd 100644 --- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm019-dc5" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_IMLS is not set diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig index b370bc1835ac..d579135836ea 100644 --- a/configs/xilinx_zynqmp_zcu102_defconfig +++ b/configs/xilinx_zynqmp_zcu102_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_IMLS is not set diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig index 976445288980..d88035d5eca4 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-revB" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_IMLS is not set -- 1.9.1

1 0

[U-Boot] [PATCH 0/5] Update fastboot sparse image handling
by Steve Rae 01 Jun '16

01 Jun '16

While retaining the storage abstraction feature implemented in U-Boot, this series updates the fastboot sparse image handling by (1) fixing broken code, (2) resync'ing with the upstream code, and (3) improving performance when writing CHUNK_TYPE_FILL Steve Rae (5): fastboot: sparse: remove session-id logic fastboot: sparse: resync common/image-sparse.c (part 1) fastboot: sparse: resync common/image-sparse.c (part 2) fastboot: sparse: implement reserve() fastboot: sparse: improve CHUNK_TYPE_FILL write performance common/fb_mmc.c | 79 +++---- common/fb_nand.c | 100 +++++---- common/image-sparse.c | 478 +++++++++++++++------------------------- drivers/usb/gadget/f_fastboot.c | 47 ++-- include/fastboot.h | 4 +- include/fb_mmc.h | 7 +- include/fb_nand.h | 7 +- include/image-sparse.h | 29 ++- 8 files changed, 309 insertions(+), 442 deletions(-) -- 1.8.5

3 8

[U-Boot] [PATCH 0/3] armv8/fsl-layerscape: add dwc3 gadget driver support
by Rajat Srivastava 01 Jun '16

01 Jun '16

Adds support for dwc3 gadget driver for ARM v8 platform of layerscape series. Currently this patch has been tested for LS1043A. Rajat Srivastava (3): usb: ums: support multiple controllers using controller_index armv8/fsl-layerscape: add dwc3 gadget driver support armv8/fsl-layerscape: enable dwc3 gadget driver support arch/arm/cpu/armv8/fsl-layerscape/soc.c | 87 +++++++++++++++++++++- .../include/asm/arch-fsl-layerscape/immap_lsch2.h | 6 ++ .../include/asm/arch-fsl-layerscape/sys_proto.h | 11 +++ cmd/usb_mass_storage.c | 2 +- drivers/usb/dwc3/core.c | 12 +++ drivers/usb/gadget/f_mass_storage.c | 10 ++- include/configs/ls1043aqds.h | 15 ++++ 7 files changed, 139 insertions(+), 4 deletions(-) create mode 100644 arch/arm/include/asm/arch-fsl-layerscape/sys_proto.h -- 1.9.1

5 11

[U-Boot] [PATCH v2 0/2] i2c: atmel: add driver for Atmel i2c platform
by Songjun Wu 01 Jun '16

01 Jun '16

The i2c driver includes two parts. 1) Driver code to implement the i2c function. 2) Device tree binding documentation, it describes how to add the i2c in device tree. Changes in v2: - Add code to get and enable clock. - Add phandles to input clocks Songjun Wu (2): i2c: atmel: add i2c driver i2c: atmel: DT binding for i2c driver doc/device-tree-bindings/i2c/i2c-at91.txt | 26 +++ drivers/i2c/Kconfig | 10 + drivers/i2c/Makefile | 1 + drivers/i2c/at91_i2c.c | 345 ++++++++++++++++++++++++++++++ drivers/i2c/at91_i2c.h | 77 +++++++ 5 files changed, 459 insertions(+) create mode 100644 doc/device-tree-bindings/i2c/i2c-at91.txt create mode 100644 drivers/i2c/at91_i2c.c create mode 100644 drivers/i2c/at91_i2c.h -- 2.7.4

1 2

[U-Boot] [RFC] tools/env: Support UBI devices
by Kevin Smith 01 Jun '16

01 Jun '16

Instead of requiring gluebi to update u-boot environments from Linux, directly support writing to an UBI device. The fw_env.config file will look something like this: Device Offset Envsize LEB Size Count /dev/ubi0_0 0 0x10000 0x1f000 1 It is important to use LEB size instead of PEB size when using UBI. Signed-off-by: Kevin Smith <kevin.smith(a)elecsyscorp.com> Cc: Michael Heimpold <mhei(a)heimpold.de> Cc: Joe Hershberger <joe.hershberger(a)ni.com> --- tools/env/fw_env.c | 71 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 23 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index ba11f77..af7a8ae 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -13,6 +13,7 @@ #include <errno.h> #include <env_flags.h> #include <fcntl.h> +#include <limits.h> #include <linux/stringify.h> #include <stdio.h> #include <stdlib.h> @@ -29,6 +30,7 @@ #else # define __user /* nothing */ # include <mtd/mtd-user.h> +# include <mtd/ubi-user.h> #endif #include "fw_env.h" @@ -54,6 +56,8 @@ struct envdev_s { uint8_t mtd_type; /* type of the MTD device */ }; +#define UBI_TYPE UCHAR_MAX + static struct envdev_s envdevices[2] = { { @@ -943,7 +947,7 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, continue; } - if (mtd_type != MTD_ABSENT) { + if (mtd_type != MTD_ABSENT && mtd_type != UBI_TYPE) { erase.start = blockstart; ioctl(fd, MEMUNLOCK, &erase); /* These do not need an explicit erase cycle */ @@ -956,11 +960,21 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, } } - if (lseek (fd, blockstart, SEEK_SET) == -1) { - fprintf (stderr, - "Seek error on %s: %s\n", - DEVNAME (dev), strerror (errno)); - return -1; + if (mtd_type == UBI_TYPE) { + uint64_t updatesize = erasesize; + if (ioctl(fd, UBI_IOCVOLUP, &updatesize) != 0) { + fprintf(stderr, + "Error updating UBI volume: %s\n", + strerror(errno)); + return -1; + } + } else { + if (lseek (fd, blockstart, SEEK_SET) == -1) { + fprintf (stderr, + "Seek error on %s: %s\n", + DEVNAME (dev), strerror (errno)); + return -1; + } } #ifdef DEBUG @@ -973,7 +987,7 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, return -1; } - if (mtd_type != MTD_ABSENT) + if (mtd_type != MTD_ABSENT && mtd_type != UBI_TYPE) ioctl(fd, MEMLOCK, &erase); processed += erasesize; @@ -1084,6 +1098,7 @@ static int flash_read (int fd) { struct mtd_info_user mtdinfo; struct stat st; + int32_t lnum; int rc; rc = fstat(fd, &st); @@ -1095,28 +1110,38 @@ static int flash_read (int fd) if (S_ISCHR(st.st_mode)) { rc = ioctl(fd, MEMGETINFO, &mtdinfo); - if (rc < 0) { - fprintf(stderr, "Cannot get MTD information for %s\n", - DEVNAME(dev_current)); - return -1; + if (rc >= 0) { + if (mtdinfo.type != MTD_NORFLASH && + mtdinfo.type != MTD_NANDFLASH && + mtdinfo.type != MTD_DATAFLASH && + mtdinfo.type != MTD_UBIVOLUME) { + fprintf (stderr, + "Unsupported flash type %u on %s\n", + mtdinfo.type, DEVNAME(dev_current)); + return -1; + } + DEVTYPE(dev_current) = mtdinfo.type; + goto read; } - if (mtdinfo.type != MTD_NORFLASH && - mtdinfo.type != MTD_NANDFLASH && - mtdinfo.type != MTD_DATAFLASH && - mtdinfo.type != MTD_UBIVOLUME) { - fprintf (stderr, "Unsupported flash type %u on %s\n", - mtdinfo.type, DEVNAME(dev_current)); - return -1; + + /* Check for an UBI-type device */ + lnum = 0; + rc = ioctl(fd, UBI_IOCEBISMAP, &lnum); + if (rc >= 0) { + DEVTYPE(dev_current) = UBI_TYPE; + goto read; } + + fprintf(stderr, "Cannot get MTD information for %s\n", + DEVNAME(dev_current)); + return -1; } else { - memset(&mtdinfo, 0, sizeof(mtdinfo)); - mtdinfo.type = MTD_ABSENT; + DEVTYPE(dev_current) = MTD_ABSENT; } - DEVTYPE(dev_current) = mtdinfo.type; - +read: rc = flash_read_buf(dev_current, fd, environment.image, CUR_ENVSIZE, - DEVOFFSET (dev_current), mtdinfo.type); + DEVOFFSET (dev_current), DEVTYPE (dev_current)); if (rc != CUR_ENVSIZE) return -1; -- 2.8.0

3 2

[U-Boot] [PATCH 0/2] common: usb_storage : Implement logic to calculate optimal
by Rajesh Bhagat 01 Jun '16

01 Jun '16

Implements the logic to calculate the optimal usb maximum trasfer blocks instead of sending USB_MAX_XFER_BLK blocks which is 65535 and 20 in case of EHCI and other USB protocols respectively Sample Behaviour: Fallback to 16384 blocks once failure is seen on 32768. => usb write a0000000 0 10000; USB write: device 0 block # 0, count 65536 ... usb_write: retry #2, xfer_blk 4096, smallblks 4096 usb_write: retry #2, xfer_blk 8192, smallblks 8192 usb_write: retry #2, xfer_blk 16384, smallblks 16384 usb_write: retry #2, xfer_blk 32768, smallblks 32768 EHCI timed out on TD - token=0x10008c80 usb_write: retry #1, xfer_blk 16384, smallblks 16384 usb_write: retry #2, xfer_blk 16384, smallblks 16384 usb_write: retry #2, xfer_blk 16384, smallblks 4096 65536 blocks write: OK Rajesh Bhagat (2): common: usb_storage : Implement logic to calculate optimal usb maximum trasfer blocks common: usb_storage : Seperate optimal blocks logic calculation for read/write common/usb_storage.c | 66 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 19 deletions(-) -- 2.6.2.198.g614a2ac

2 6