April 2011 - U-Boot

[U-Boot] kfreebsd build failure - fw_env.c:43:27: error: mtd/mtd-user.h: No such file or directory
by Loïc Minier 12 Apr '11

12 Apr '11

Hey "make tools-all" fails under Debian kfreebsd-amd64 and -i386 due to the lack of MTD headers: make[2]: Entering directory `/build/buildd-u-boot_2010.12-2-kfreebsd-i386-yWW1BA/u-boot-2010.12/tools/env' gcc -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -idirafter /build/buildd-u-boot_2010.12-2-kfreebsd-i386-yWW1BA/u-boot-2010.12/include -idirafter /build/buildd-u-boot_2010.12-2-kfreebsd-i386-yWW1BA/u-boot-2010.12/include2 -idirafter /build/buildd-u-boot_2010.12-2-kfreebsd-i386-yWW1BA/u-boot-2010.12/include -DUSE_HOSTCC -o fw_printenv crc32.c fw_env.c fw_env_main.c fw_env.c:43:27: error: mtd/mtd-user.h: No such file or directory [...] https://buildd.debian.org/fetch.cgi?pkg=u-boot&arch=kfreebsd-i386&ver=2010.… I didn't find any MTD header in the kfreebsd package. Would someone know whether this is supposed to build under freebsd? If not, does it make sense to ifdef out the MTD uses in fw_env.c? (I think it's also possible to interact with real files containing the environment.) If not, I guess this should be removed from tools-all is mtd/mtd-user.h isn't found; is there any recommendation in doing this? Cheers, -- Loïc Minier

3 5

[U-Boot] Image copy to ram
by Matthias Weißer 12 Apr '11

12 Apr '11

Hi I looked into the documentation but I can't find a command which copies an image from one address to another. This would be extremly useful for me as reading from (uncached) flash is way slower then reading from cached SDRAM. Currently booting is done by a simple bootm. This requires that the image is read from flash twice (once for checksum and once for decompression) If the image is copied to DRAM first it has to be read from flash only once. Checksum calculation and decompression is done in SDRAM which saves me about 500ms on my system. A further optimization would be to do the checksum calculation while copying the image to SDRAM which would save some more ms. So, if there is no such command I am willing to implemt 'imcpy'. Regards, Matthias

3 4

[U-Boot] [PATCH] Drop config.h include in tools/imximage.h
by Loïc Minier 12 Apr '11

12 Apr '11

"make tools-all" should allow building tools such as mkimage and the new imximage without any config, but imximage.c currently fails to build with: imximage.h:27:20: error: config.h: No such file or directory config.h is not needed in imximage.h nor in imximage.c, and imximage.h is only included from imximage.c, so drop this include to fix the build. Signed-off-by: Loïc Minier <loic.minier(a)linaro.org> --- tools/imximage.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/imximage.h b/tools/imximage.h index 38ca6be..d126a46 100644 --- a/tools/imximage.h +++ b/tools/imximage.h @@ -24,8 +24,6 @@ #ifndef _IMXIMAGE_H_ #define _IMXIMAGE_H_ -#include <config.h> - #define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */ #define MAX_HW_CFG_SIZE_V1 60 /* Max number of registers imx can set for v1 */ #define APP_CODE_BARKER 0xB1 -- 1.7.2.3

2 1

[U-Boot] [PATCH] Fix misc spelling errors found by lintian
by Loïc Minier 12 Apr '11

12 Apr '11

--- arch/arm/cpu/arm920t/at91rm9200/ether.c | 2 +- arch/sparc/cpu/leon2/cpu_init.c | 4 ++-- arch/sparc/cpu/leon3/cpu_init.c | 4 ++-- common/cmd_usb.c | 2 +- common/usb_storage.c | 2 +- drivers/net/at91_emac.c | 2 +- fs/jffs2/jffs2_1pass.c | 2 +- fs/jffs2/jffs2_nand_1pass.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/cpu/arm920t/at91rm9200/ether.c b/arch/arm/cpu/arm920t/at91rm9200/ether.c index e1cdeba..d7135c5 100644 --- a/arch/arm/cpu/arm920t/at91rm9200/ether.c +++ b/arch/arm/cpu/arm920t/at91rm9200/ether.c @@ -39,7 +39,7 @@ typedef struct { #define RBF_MULTICAST (1<<30) #define RBF_UNICAST (1<<29) #define RBF_EXTERNAL (1<<28) -#define RBF_UNKOWN (1<<27) +#define RBF_UNKNOWN (1<<27) #define RBF_SIZE 0x07ff #define RBF_LOCAL4 (1<<26) #define RBF_LOCAL3 (1<<25) diff --git a/arch/sparc/cpu/leon2/cpu_init.c b/arch/sparc/cpu/leon2/cpu_init.c index a24f778..795c7d7 100644 --- a/arch/sparc/cpu/leon2/cpu_init.c +++ b/arch/sparc/cpu/leon2/cpu_init.c @@ -47,9 +47,9 @@ struct { * initialize a bunch of registers. * * Run from FLASH/PROM: - * - until memory controller is set up, only registers avaiable + * - until memory controller is set up, only registers available * - no global variables available for writing - * - constants avaiable + * - constants available */ void cpu_init_f(void) diff --git a/arch/sparc/cpu/leon3/cpu_init.c b/arch/sparc/cpu/leon3/cpu_init.c index be22ec2..cba9d0e 100644 --- a/arch/sparc/cpu/leon3/cpu_init.c +++ b/arch/sparc/cpu/leon3/cpu_init.c @@ -57,9 +57,9 @@ struct { * initialize a bunch of registers. * * Run from FLASH/PROM: - * - until memory controller is set up, only registers avaiable + * - until memory controller is set up, only registers available * - no global variables available for writing - * - constants avaiable + * - constants available */ void cpu_init_f(void) diff --git a/common/cmd_usb.c b/common/cmd_usb.c index b04a8df..7fcc61a 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -580,7 +580,7 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) break; } if (dev == NULL) { - printf("*** NO Device avaiable ***\n"); + printf("*** NO Device available ***\n"); return 0; } else { usb_display_desc(dev); diff --git a/common/usb_storage.c b/common/usb_storage.c index 1e6cd6a..de48c5a 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -254,7 +254,7 @@ int usb_stor_scan(int mode) dev = usb_get_dev_index(i); /* get device */ USB_STOR_PRINTF("i=%d\n", i); if (dev == NULL) - break; /* no more devices avaiable */ + break; /* no more devices available */ if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) { /* OK, it's a storage device. Iterate over its LUNs diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c index 4e5685c..90eb515 100644 --- a/drivers/net/at91_emac.c +++ b/drivers/net/at91_emac.c @@ -93,7 +93,7 @@ #define RBF_MULTICAST (1<<30) #define RBF_UNICAST (1<<29) #define RBF_EXTERNAL (1<<28) -#define RBF_UNKOWN (1<<27) +#define RBF_UNKNOWN (1<<27) #define RBF_SIZE 0x07ff #define RBF_LOCAL4 (1<<26) #define RBF_LOCAL3 (1<<25) diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index c4f7445..5ddc2b9 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -794,7 +794,7 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest) #endif default: /* unknown */ - putLabeledWord("UNKOWN COMPRESSION METHOD = ", jNode->compr); + putLabeledWord("UNKNOWN COMPRESSION METHOD = ", jNode->compr); put_fl_mem(jNode, pL->readbuf); return -1; break; diff --git a/fs/jffs2/jffs2_nand_1pass.c b/fs/jffs2/jffs2_nand_1pass.c index 3982003..740f787 100644 --- a/fs/jffs2/jffs2_nand_1pass.c +++ b/fs/jffs2/jffs2_nand_1pass.c @@ -350,7 +350,7 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 ino, char *dest, #endif default: /* unknown */ - putLabeledWord("UNKOWN COMPRESSION METHOD = ", inode->compr); + putLabeledWord("UNKNOWN COMPRESSION METHOD = ", inode->compr); return -1; } } -- 1.7.2.3

3 4

[U-Boot] [PATCH] Fix gunzip to work for any gziped uImage size
by Catalin Radu 12 Apr '11

12 Apr '11

Signed-off-by: Catalin Radu <Catalin(a)VirtualMetrix.com> --- lib/gunzip.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/gunzip.c b/lib/gunzip.c index 482a476..8b16b24 100644 --- a/lib/gunzip.c +++ b/lib/gunzip.c @@ -106,12 +106,16 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, s.avail_in = *lenp - offset; s.next_out = dst; s.avail_out = dstlen; - r = inflate(&s, Z_FINISH); - if ((r != Z_STREAM_END) && (stoponerr==1)) { - printf ("Error: inflate() returned %d\n", r); - inflateEnd(&s); - return (-1); - } + do { + r = inflate(&s, Z_FINISH); + if (r != Z_STREAM_END && r != Z_BUF_ERROR && stoponerr == 1) { + printf("Error: inflate() returned %d\n", r); + inflateEnd(&s); + return -1; + } + s.avail_in = *lenp - offset - (int)(s.next_out - (unsigned char*)dst); + s.avail_out = dstlen; + } while (r == Z_BUF_ERROR); *lenp = s.next_out - (unsigned char *) dst; inflateEnd(&s); -- 1.6.3.3

3 2

[U-Boot] [PATCH] Fix gunzip to work for any gzipped uImage size Signed-off-by: Catalin Radu <Catalin@VirtualMetrix.com>
by Catalin Radu 12 Apr '11

12 Apr '11

--- lib/gunzip.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/gunzip.c b/lib/gunzip.c index 482a476..18cb45b 100644 --- a/lib/gunzip.c +++ b/lib/gunzip.c @@ -106,12 +106,16 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, s.avail_in = *lenp - offset; s.next_out = dst; s.avail_out = dstlen; - r = inflate(&s, Z_FINISH); - if ((r != Z_STREAM_END) && (stoponerr==1)) { - printf ("Error: inflate() returned %d\n", r); - inflateEnd(&s); - return (-1); - } + do { + r = inflate(&s, Z_FINISH); + if ((r != Z_STREAM_END) && (r != Z_BUF_ERROR) && (stoponerr==1)) { + printf ("Error: inflate() returned %d\n", r); + inflateEnd(&s); + return (-1); + } + s.avail_in = *lenp - offset - (int)(s.next_out - (unsigned char*)dst); + s.avail_out = dstlen; + } while (r == Z_BUF_ERROR); *lenp = s.next_out - (unsigned char *) dst; inflateEnd(&s); -- 1.6.3.3

3 4

[U-Boot] [PATCH 1/1] Fix min/max macros in include/common.h
by Aaron Williams 12 Apr '11

12 Apr '11

There is a bug in the min and max macros in common.h which occurs if Y is a larger type than X. For example, if Y is a 64-bit value and X is a 32-bit value then Y will be truncated to 32-bits. This fix matches what is done in the Linux kernel but without the additional type checking present in the kernel version. Signed-off-by: Aaron Williams <aaron.williams(a)caviumnetworks.com> include/common.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/common.h b/include/common.h index d8c912d..cf5c076 100644 --- a/include/common.h +++ b/include/common.h @@ -180,11 +180,13 @@ typedef void (interrupt_handler_t)(void *); * General Purpose Utilities */ #define min(X, Y) \ - ({ typeof (X) __x = (X), __y = (Y); \ + ({ typeof (X) __x = (X); \ + typeof (Y) __y = (Y); \ (__x < __y) ? __x : __y; }) #define max(X, Y) \ - ({ typeof (X) __x = (X), __y = (Y); \ + ({ typeof (X) __x = (X); \ + typeof (Y) __y = (Y); \ (__x > __y) ? __x : __y; }) #define MIN(x, y) min(x, y)

2 2

[U-Boot] [PATCH] da850evm: fix NAND WSTROBE and TA timings
by Ben Gardiner 12 Apr '11

12 Apr '11

The current NAND timings, introduced in commit a3f88293ddd13facd734769c1664d35ab4ed681f da850evm: setup the NAND flash timings , incorrectly set WSTROBE and TA to 0. A more recent inspection of the values set by the Linux kernel indicates that these should be set to 1. Set the WSTROBE and TA field of the EMIFA cycle-count timings configuration to 1 to match the values set by linux. Signed-off-by: Ben Gardiner <bengardiner(a)nanometrics.ca> CC: Stefano Babic <sbabic(a)denx.de> CC: Sandeep Paulraj <s-paulraj(a)ti.com> CC: Scott Wood <scottwood(a)freescale.com> --- board/davinci/da8xxevm/da850evm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index b088c9c..73eaa48 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -179,12 +179,12 @@ int board_init(void) * Linux kernel @ 25MHz EMIFA */ writel((DAVINCI_ABCR_WSETUP(0) | - DAVINCI_ABCR_WSTROBE(0) | + DAVINCI_ABCR_WSTROBE(1) | DAVINCI_ABCR_WHOLD(0) | DAVINCI_ABCR_RSETUP(0) | DAVINCI_ABCR_RSTROBE(1) | DAVINCI_ABCR_RHOLD(0) | - DAVINCI_ABCR_TA(0) | + DAVINCI_ABCR_TA(1) | DAVINCI_ABCR_ASIZE_8BIT), &davinci_emif_regs->ab2cr); /* CS3 */ #endif -- 1.7.1

1 0

[U-Boot] Health insurance (4/12/2011)
by Robert Moore 12 Apr '11

12 Apr '11

Hello, Our company is an authorized agent for a unique advertising opportunity, reaching over 36,000,000 consumers, 94% of which are US based. We're able to present our users with a preferred choice whenever they are looking for anything on the major search engines. I seek one source to send the users on our Network, from the major search engines, for health insurance in Thornton and surrounding markets. Please contact me at your earliest convenience. I am in the office daily from 9:00 AM to 5:00 PM Pacific time. Best regards, Robert Moore Placement Analyst, SPN Search Phone: (888) 418-4028, ext 2011

1 0

Re: [U-Boot] ramtron f-ram
by Ran Shalit 12 Apr '11

12 Apr '11

Hello, I use the spi interfaces with more then one flash in the U-Boot. Actually I use one spi fram(ramtron) and one spi flash (stmicro). I first thought that configuring both flags is just what I need: CONFIG_SPI_FLASH_STMICRO CONFIG_SPI_FLASH_RAMTRON But since the ramtron implementation change the value of IDCODE_CONT_LEN, I will get that this constant (IDCODE_CONT_LEN) is OK for one flash but wrong in the other. I had no choice but to make changes in the code for my case. just wandered if there is really such limitation (that I cannot use ramtron & other spi flash together). Best Regards, Ran +++ b/drivers/mtd/spi/spi_flash.c @@ -146,10 +146,18 @@ static const struct { #ifdef CONFIG_SPI_FLASH_WINBOND { 0, 0xef, spi_flash_probe_winbond, }, #endif +#ifdef CONFIG_SPI_FRAM_RAMTRON + { 6, 0xc2, spi_fram_probe_ramtron, }, *+# undef IDCODE_CONT_LEN +# define IDCODE_CONT_LEN 6 *+#endif

2 1