January 2014 - U-Boot

[U-Boot] [PATCH v2 1/2] env_mmc: make board configurable the partition for the environment
by Hector Palacios 17 Jan '14

17 Jan '14

This complements commit 9404a5fc7cb58 "env_mmc: allow environment to be in an eMMC partition" by allowing boards to accommodate the partition to use for the environment in different scenarios (similarly to what is done with the mmc dev number). Depending on the detected boot media, boards may decide to store the environment in a different partition. The __weak function also allows to remove some ifdefs from the code. If CONFIG_SYS_MMC_ENV_PART is not defined, partition 0 is assumed (default value for U-Boot when a partition is not provided). Signed-off-by: Hector Palacios <hector.palacios(a)digi.com> --- Notes: Changes since v1: - Use default define if not set common/env_mmc.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/common/env_mmc.c b/common/env_mmc.c index 78c2bc7a1f08..570caf63aeae 100644 --- a/common/env_mmc.c +++ b/common/env_mmc.c @@ -64,6 +64,14 @@ __weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr) __weak int mmc_get_env_devno(void) { return CONFIG_SYS_MMC_ENV_DEV; + +#if !defined(CONFIG_SYS_MMC_ENV_PART) +#define CONFIG_SYS_MMC_ENV_PART 0 +#endif + +__weak int mmc_get_env_partno(void) +{ + return CONFIG_SYS_MMC_ENV_PART; } int env_init(void) @@ -77,6 +85,9 @@ int env_init(void) static int init_mmc_for_env(struct mmc *mmc) { + int mmc_env_devno = mmc_get_env_devno(); + int mmc_env_partno = mmc_get_env_partno(); + if (!mmc) { puts("No MMC card found\n"); return -1; @@ -87,30 +98,23 @@ static int init_mmc_for_env(struct mmc *mmc) return -1; } -#ifdef CONFIG_SYS_MMC_ENV_PART - if (CONFIG_SYS_MMC_ENV_PART != mmc->part_num) { - int mmc_env_devno = mmc_get_env_devno(); - - if (mmc_switch_part(mmc_env_devno, - CONFIG_SYS_MMC_ENV_PART)) { + if (mmc_env_partno != mmc->part_num) { + if (mmc_switch_part(mmc_env_devno, mmc_env_partno)) { puts("MMC partition switch failed\n"); return -1; } } -#endif return 0; } static void fini_mmc_for_env(struct mmc *mmc) { -#ifdef CONFIG_SYS_MMC_ENV_PART int mmc_env_devno = mmc_get_env_devno(); + int mmc_env_partno = mmc_get_env_partno(); - if (CONFIG_SYS_MMC_ENV_PART != mmc->part_num) - mmc_switch_part(mmc_env_devno, - mmc->part_num); -#endif + if (mmc_env_partno != mmc->part_num) + mmc_switch_part(mmc_env_devno, mmc->part_num); } #ifdef CONFIG_CMD_SAVEENV

3 5

[U-Boot] sf: Discussion on quad changes
by Jagan Teki 17 Jan '14

17 Jan '14

Hi All, This particular discussion is a next level add-on for thread [1] State of u-boot now: - Added quad changes on u-boot and will be available in coming release. - Added commands are 1) 1-line # Array slow read, Array fast read(available before) 2) 2-line # Dual fast read, Dual IO read 3) 3-line # Quad fast read, quad IO read, Quad page program - The implementation "will determine the fastest command by taking the supported commands from the flash and the controller, controller is always been a priority." - Suppose we have a flash that supports all types of commands then from driver side we have an option to set the particular command and the same option will goes to sf and will determine the fastest one. ex: if flash supports all, but the driver supports dual fast then the outcome read could be dual fast. And even Linux will also does the similar implementation, i guess. The main reason for going maximum or based on controller setting transfer is to improve sf performance. But from previous thread of discussion - Gerhard Sittig, identified a side-effect on this implementation as per as board to connected flash perceptive. The question as per my understanding was "If a controller support 1, 2, and 4 lines then the BoardA is designed to connect a flash with 4-lines, BoardB is designed to connect a flash with 2-lines and BoardC is designed to connect a flash with 1-line." In above scenario - as we have a common controller driver that may set an option to support quad then BoardB and BoardC will fail to transfer. Gerhard Sittig, please add if i miss any points here! I do agree this scenario and I have few possible inputs. 1) dynamic - auto-detection: Get the max_nof_lines based on the board to connected flash. So-that we can configure the transfer mode based on the lines. no idea yet, how to get the max_nof_lines dynamically - any inputs. 2) static: from user level we may give the max_nof_lines ex: sf probe probe [[[bus:]cs]:max_nof_line] [hz] [mode] If user can't input max_nof_line so-that driver will go with single and the rest case transfer modes assigned based on the given input. for Linux it can be pdata or dts. Request for comments! [1] http://u-boot.10912.n7.nabble.com/PATCH-v7-01-17-sf-Add-extended-read-comma… -- Thanks, Jagan.

3 2

[U-Boot] [PATCH RFC] usb storage: set env variable to host controller no
by Tim Harvey 17 Jan '14

17 Jan '14

In order to support boot scripts that dynamically create kernel arguments that describe the boot device, a method is needed to determine what USB host controller number is associated with current usb storage device set via 'usb dev <n>'. This patch dynamically sets the 'usbdevport' env variable according to the instance number of the EHCI host controller when the usb storage device is set with the 'usb dev <n>' command. This is currently being used to be able to pass a kernel command-line argument the the IMX Android kernel to tell it which USB host device to boot from: fsl-ehci.0 (OTG) or fsl-ehci.1 (EHCI). Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- common/usb_storage.c | 71 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 10 deletions(-) diff --git a/common/usb_storage.c b/common/usb_storage.c index 6ac358d..628eef3 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -160,10 +160,66 @@ unsigned long usb_stor_write(int device, lbaint_t blknr, struct usb_device * usb_get_dev_index(int index); void uhci_show_temp_int_td(void); +struct usb_device *get_usb_dev(int index) +{ + struct usb_device *dev; + int i; + + dev = NULL; + for (i = 0; i < USB_MAX_DEVICE; i++) { + dev = usb_get_dev_index(i); + if (dev == NULL) + return NULL; + if (dev->devnum == usb_dev_desc[index].target) + break; + } + + return dev; +} + #ifdef CONFIG_PARTITIONS block_dev_desc_t *usb_stor_get_dev(int index) { - return (index < usb_max_devs) ? &usb_dev_desc[index] : NULL; + block_dev_desc_t *ret; + + ret = (index < usb_max_devs) ? &usb_dev_desc[index] : NULL; + if (ret) { + int port = -1; + struct usb_device *dev = get_usb_dev(index); + + if (dev && dev->parent) { + /* dev->devnum is device number on USB bus */ + struct usb_device *parent = dev->parent; + struct usb_device *p; + int i, j; + + /* find host controller for this device */ + while (parent->parent) + parent = parent->parent; + /* find host controller index */ + for (i = 0, j = 0; i < USB_MAX_DEVICE; i++) { + p = usb_get_dev_index(i); + if (!p) + break; + /* host controller */ + if (!p->parent) { + if (parent == p) { + port = j; + break; + } + j++; + } + } + } + if (port < 0) { + printf("cannot locate device's port.\n"); + } else { + char buf[5]; + sprintf(buf, "%d", port); + setenv("usbdevport", buf); + } + } + return ret; } #endif @@ -1053,15 +1109,10 @@ unsigned long usb_stor_read(int device, lbaint_t blknr, device &= 0xff; /* Setup device */ - debug("\nusb_read: dev %d \n", device); - dev = NULL; - for (i = 0; i < USB_MAX_DEVICE; i++) { - dev = usb_get_dev_index(i); - if (dev == NULL) - return 0; - if (dev->devnum == usb_dev_desc[device].target) - break; - } + debug("\nusb_read: dev %d\n", device); + dev = get_usb_dev(device); + if (!dev) + return 0; ss = (struct us_data *)dev->privptr; usb_disable_asynch(1); /* asynch transfer not allowed */ -- 1.8.4.2

1 0

[U-Boot] [PATCH 1/5] fs: fix generic save command implementation
by Stephen Warren 17 Jan '14

17 Jan '14

From: Stephen Warren <swarren(a)nvidia.com> Fix a few issues with the generic "save" shell command, and fs_write() function. 1) fstypes[].write wasn't filled in for some file-systems, and isn't checked when used, which could cause crashes/... if executing save on e.g. fat/ext filesystems. 2) fs_write() requires the length argument to be non-zero, since it needs to know exactly how many bytes to write. Adjust the comments and code according to this. 3) fs_write() wasn't prototyped in <fs.h> like other generic functions; other code should be able to call this directly rather than invoking the "save" shell command. Cc: Simon Glass <sjg(a)chromium.org> Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- fs/fs.c | 9 +++------ include/fs.h | 10 ++++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/fs/fs.c b/fs/fs.c index be1855d1291f..9c2ef6b6597c 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -75,6 +75,7 @@ static struct fstype_info fstypes[] = { .close = fat_close, .ls = file_fat_ls, .read = fat_read_file, + .write = fs_write_unsupported, }, #endif #ifdef CONFIG_FS_EXT4 @@ -84,6 +85,7 @@ static struct fstype_info fstypes[] = { .close = ext4fs_close, .ls = ext4fs_ls, .read = ext4_read_file, + .write = fs_write_unsupported, }, #endif #ifdef CONFIG_SANDBOX @@ -212,16 +214,11 @@ int fs_write(const char *filename, ulong addr, int offset, int len) void *buf; int ret; - /* - * We don't actually know how many bytes are being read, since len==0 - * means read the whole file. - */ buf = map_sysmem(addr, len); ret = info->write(filename, buf, offset, len); unmap_sysmem(buf); - /* If we requested a specific number of bytes, check we got it */ - if (ret >= 0 && len && ret != len) { + if (ret >= 0 && ret != len) { printf("** Unable to write file %s **\n", filename); ret = -1; } diff --git a/include/fs.h b/include/fs.h index 7d9403ed8758..97b0094e954b 100644 --- a/include/fs.h +++ b/include/fs.h @@ -55,6 +55,16 @@ int fs_ls(const char *dirname); int fs_read(const char *filename, ulong addr, int offset, int len); /* + * Write file "filename" to the partition previously set by fs_set_blk_dev(), + * from address "addr", starting at byte offset "offset", and writing "len" + * bytes. "offset" may be 0 to write to the start of the file. Note that not + * all filesystem types support offset!=0. + * + * Returns number of bytes read on success. Returns <= 0 on error. + */ +int fs_write(const char *filename, ulong addr, int offset, int len); + +/* * Common implementation for various filesystem commands, optionally limited * to a specific filesystem type via the fstype parameter. */ -- 1.8.1.5

2 6

[U-Boot] [PATCH] omap3_beagle: use omap3-beagle.dtb for the C4 revision
by Robert Nelson 17 Jan '14

17 Jan '14

findftd is currently setting fdtfile to undefined for the beagle c4, select omap3-beagle.dtb instead Signed-off-by: Robert Nelson <robertcnelson(a)gmail.com> --- include/configs/omap3_beagle.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 1b566c0..c58bc91 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -241,6 +241,8 @@ "setenv fdtfile omap3-beagle.dtb; fi; " \ "if test $beaglerev = Cx; then " \ "setenv fdtfile omap3-beagle.dtb; fi; " \ + "if test $beaglerev = C4; then " \ + "setenv fdtfile omap3-beagle.dtb; fi; " \ "if test $beaglerev = xMAB; then " \ "setenv fdtfile omap3-beagle-xm.dtb; fi; " \ "if test $beaglerev = xMC; then " \ -- 1.8.5.2

2 1

[U-Boot] Compiling fw_printenv tool
by Alexey Smishlayev 17 Jan '14

17 Jan '14

Hello! I'm trying to compile fw_printenv, to work with U-Boot environment variables under my linux os. I'm using commands: $ cd u-boot/ $ make ARCH=arm CROSS_COMPILE=arm-none-linux-gnueabi- env The tool compiles successfully, I get the executable under u-boot/tools/env/fw_printenv, but it seem to be compiled for my host machine. On my device it says: # ./fw_printenv: line 1: syntax error: "(" unexpected How do I cross compile it for my embedded system? Do I just set the HOSTCC environment variable in the Makefile? Best regards, Alexey Smishlayev

4 11

[U-Boot] [PATCH 1/3] sf: ops: Squash the malloc+memset combo
by Jagannadha Sutradharudu Teki 17 Jan '14

17 Jan '14

Squash the malloc()+memset() combo in favor of calloc(). Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> Cc: Marek Vasut <marex(a)denx.de> --- drivers/mtd/spi/sf_ops.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 1f1bb36..9650486 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -381,8 +381,7 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, } cmdsz = SPI_FLASH_CMD_LEN + flash->dummy_byte; - cmd = malloc(cmdsz); - memset(cmd, 0, cmdsz); + cmd = calloc(1, cmdsz); cmd[0] = flash->read_cmd; while (len) { -- 1.8.3

3 2

[U-Boot] A list of dead email addresses of board maintainers
by Masahiro Yamada 17 Jan '14

17 Jan '14

Hello. When I CC board maintainers, it sometimes results in bounce mails. How should we modify boards.cfg? Delete the email? Or just mark as "dead address" ? I noticed at least the following email addresses are dead: <yuli(a)arabellasw.com> <travis.sawyer(a)sandburst.com> <yusdi_santoso(a)adaptec.com> <dave(a)cray.com> <dogoil(a)etinsys.com> <eran(a)nbase.co.il> <avorontsov(a)ru.mvista.com> <u-boot-devel(a)blackfin.uclinux.org> <bluetechnix(a)blackfin.uclinux.org> The folloings are the snippet of returned mail notifier. ----- The following addresses had permanent fatal errors ----- <yuli(a)arabellasw.com> ----- Transcript of session follows ----- <yuli(a)arabellasw.com>... Deferred: Name server: arabellasw.com.: host name lookup failure Message could not be delivered for 3 days ----- The following addresses had permanent fatal errors ----- <travis.sawyer(a)sandburst.com> (reason: 550 We don't handle mail for sandburst.com) ----- The following addresses had permanent fatal errors ----- <yusdi_santoso(a)adaptec.com> (reason: 550 5.1.1 <yusdi_santoso(a)adaptec.com>: Recipient address rejected: User unknown in virtual alias table) <dave(a)cray.com> (reason: 550 5.1.1 <dave(a)cray.com>... User unknown) <dogoil(a)etinsys.com> (reason: 550 Host unknown) ----- The following addresses had permanent fatal errors ----- <eran(a)nbase.co.il> (reason: 550 Unknown user) <avorontsov(a)ru.mvista.com> (reason: 550 5.2.1 The email account that you tried to reach is disabled. s7si55219360pae.98 - gsmtp) ----- The following addresses had permanent fatal errors ----- <u-boot-devel(a)blackfin.uclinux.org> <bluetechnix(a)blackfin.uclinux.org> ----- Transcript of session follows ----- <bluetechnix(a)blackfin.uclinux.org>,<u-boot-devel(a)blackfin.uclinux.org>... Deferred: Connection timed out with blackfin.uclinux.org. Best Regards Masahiro Yamada

2 1

[U-Boot] [PATCH 0/3] fix: Trats/Trats2 default envs adjustement for 2014.01 release
by Lukasz Majewski 17 Jan '14

17 Jan '14

Adjust default envs for Trats and Trats2 boards. Those changes are supposed to cleanup and improve things for v2014.01 u-boot release. Lukasz Majewski (3): config: Update envs for trats and trats2 - new entries for new partitions ARM: trats2: dfu: Enable default Poll Timeout for Trats2 board config: Update envs for trats and trats2 - Disable L2 cache include/configs/trats.h | 6 +++++- include/configs/trats2.h | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) -- 1.7.10.4

6 15

[U-Boot] [PATCH] vexpress/armv8: Fix incorrect ethernet controller
by Bhupesh Sharma 17 Jan '14

17 Jan '14

This patch enables ethernet support in ARMv8 foundation model. The ARMv8 foundation model supports a SMSC91C111 integrated MAC and PHY module which is present at base address 0x01A000000. The previous implementation had enabled SMSC9115 ethernet controller which is not present on the ARMv8 foundation model. Tested on ARMv8 foundation model v1 and v2 by running ping/tftp between the foundation model and the host PC via a bridged network. Signed-off-by: Bhupesh Sharma <bhupesh.sharma(a)freescale.com> --- To test the ethernet functionality on a ARMv8 foundation model: - Launch the model with BRIDGED networking option: --network=bridged - This will create an ethernet interface (eth0) inside the model and an interface ARM0 on the Host PC. - Assign appropriate IP addresses: ~ On Host: $ ifconfig ARM0 10.10.10.11 ~ On foundation model: VExpress# setenv ipaddr 10.10.10.10 VExpress# setenv gatewayip 10.10.10.11 VExpress# setenv serverip 10.10.10.11 - Now try out ping/tftp tests. include/configs/vexpress_aemv8a.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index ce5f384..e851702 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -102,9 +102,9 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) -/* SMSC9115 Ethernet from SMSC9118 family */ -#define CONFIG_SMC9111 1 -#define CONFIG_SMC9111_BASE (0x1a000000) +/* SMSC91C111 Ethernet Configuration */ +#define CONFIG_SMC91111 1 +#define CONFIG_SMC91111_BASE (0x01A000000) /* PL011 Serial Configuration */ #define CONFIG_PL011_SERIAL -- 1.7.10.4

2 1