January 2009 - U-Boot

[U-Boot] [PATCH 1/1] jffs2: Fix zero sector_size when not using CONFIG_JFFS2_CMDLINE
by Tomasz Figa 27 Jan '09

27 Jan '09

This patch fixes a bug (?) introduced after inclusion of the new JFFS2 code. When not using CONFIG_JFFS2_CMDLINE, the code in cmd_jffs2.c doesn't fill in part->sector_size (keeping it as 0), but a correct value is needed by the code in jffs2_1pass.c. This causes all JFFS2 accesses to be in the same place of the memory, what obviously means impossibility to use the JFFS2 partition. This problem is fixed in this patch by including sector size calculation in non-CONFIG_JFFS2_CMDLINE mtdparts_init variant. Signed-off-by: Tomasz Figa <tomasz.figa_at_gmail.com> --- diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c index 7866c80..fe0f8d7 100644 --- a/common/cmd_jffs2.c +++ b/common/cmd_jffs2.c @@ -1778,6 +1778,96 @@ int mtdparts_init(void) */ /** + * Calculate sector size. + * + * @return sector size + */ +static inline u32 get_part_sector_size_nand(struct mtdids *id) +{ +#if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND) +#if defined(CONFIG_NAND_LEGACY) + extern struct nand_chip nand_dev_desc[CONFIG_SYS_MAX_NAND_DEVICE]; + + return nand_dev_desc[id->num].erasesize; +#else + nand_info_t *nand; + + nand = &nand_info[id->num]; + + return nand->erasesize; +#endif +#else + BUG(); + return 0; +#endif +} + +static inline u32 get_part_sector_size_nor(struct mtdids *id, struct part_info *part) +{ +#if defined(CONFIG_CMD_FLASH) + extern flash_info_t flash_info[]; + + u32 end_phys, start_phys, sector_size = 0, size = 0; + int i; + flash_info_t *flash; + + flash = &flash_info[id->num]; + + start_phys = flash->start[0] + part->offset; + end_phys = start_phys + part->size; + + for (i = 0; i < flash->sector_count; i++) { + if (flash->start[i] >= end_phys) + break; + + if (flash->start[i] >= start_phys) { + if (i == flash->sector_count - 1) { + size = flash->start[0] + flash->size - flash->start[i]; + } else { + size = flash->start[i+1] - flash->start[i]; + } + + if (sector_size < size) + sector_size = size; + } + } + + return sector_size; +#else + BUG(); + return 0; +#endif +} + +static inline u32 get_part_sector_size_onenand(void) +{ +#if defined(CONFIG_CMD_ONENAND) + struct mtd_info *mtd; + + mtd = &onenand_mtd; + + return mtd->erasesize; +#else + BUG(); + return 0; +#endif +} + +static inline u32 get_part_sector_size(struct mtdids *id, struct part_info *part) +{ + if (id->type == MTD_DEV_TYPE_NAND) + return get_part_sector_size_nand(id); + else if (id->type == MTD_DEV_TYPE_NOR) + return get_part_sector_size_nor(id, part); + else if (id->type == MTD_DEV_TYPE_ONENAND) + return get_part_sector_size_onenand(); + else + DEBUGF("Error: Unknown device type.\n"); + + return 0; +} + +/** * Parse and initialize global mtdids mapping and create global * device/partition list. * @@ -1846,6 +1936,8 @@ int mtdparts_init(void) part->offset = 0x00000000; #endif + part->sector_size = get_part_sector_size(id, part); + part->dev = current_dev; INIT_LIST_HEAD(&part->link);

2 1

[U-Boot] [PATCH] Add AMD 29LV160DB FLASH support to SBC2410 board.
by Daniel Schuler 27 Jan '09

27 Jan '09

The new SBC-2410A board from Embest now ships with 2MB NOR FLASH, for which CONFIG_AMD_LV160 has been defined in include/configs/sbc2410x.h This chip is already supported in other architectures, so AMD_ID_LV160B has been used as-is in board/sbc2410x/flash.c Signed-off-by: Daniel Schuler <dbschuler(a)gmail.com> --- board/sbc2410x/flash.c | 6 ++++++ include/configs/sbc2410x.h | 21 ++++++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/board/sbc2410x/flash.c b/board/sbc2410x/flash.c index abb0935..81aa9e8 100644 --- a/board/sbc2410x/flash.c +++ b/board/sbc2410x/flash.c @@ -69,6 +69,9 @@ ulong flash_init (void) #elif defined(CONFIG_AMD_LV800) (AMD_MANUFACT & FLASH_VENDMASK) | (AMD_ID_LV800B & FLASH_TYPEMASK); +#elif defined(CONFIG_AMD_LV160) + (AMD_MANUFACT & FLASH_VENDMASK) | + (AMD_ID_LV160B & FLASH_TYPEMASK); #else #error "Unknown flash configured" #endif @@ -142,6 +145,9 @@ void flash_print_info (flash_info_t * info) case (AMD_ID_LV800B & FLASH_TYPEMASK): printf ("1x Amd29LV800BB (8Mbit)\n"); break; + case (AMD_ID_LV160B & FLASH_TYPEMASK): + printf ("1x Amd29LV160DB (16Mbit)\n"); + break; default: printf ("Unknown Chip Type\n"); goto Done; diff --git a/include/configs/sbc2410x.h b/include/configs/sbc2410x.h index d7a6ae4..944d85b 100644 --- a/include/configs/sbc2410x.h +++ b/include/configs/sbc2410x.h @@ -139,7 +139,7 @@ #define CONFIG_SYS_LOAD_ADDR 0x33000000 /* default load address */ -/* the PWM TImer 4 uses a counter of 15625 for 10 ms, so we need */ +/* the PWM Timer 4 uses a counter of 15625 for 10 ms, so we need */ /* it to wrap 100 times (total 1562500) to get 1 sec. */ #define CONFIG_SYS_HZ 1562500 @@ -173,29 +173,36 @@ */ /* #define CONFIG_AMD_LV400 1 /\* uncomment this if you have a LV400 flash *\/ */ -#define CONFIG_AMD_LV800 1 /* uncomment this if you have a LV800 flash */ +/* #define CONFIG_AMD_LV800 1 /\* uncomment this if you have a LV800 flash *\/ */ + +#define CONFIG_AMD_LV160 1 /* uncomment this if you have a LV160 flash */ #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ +#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ + +#ifdef CONFIG_AMD_LV160 +#define PHYS_FLASH_SIZE 0x00200000 /* 2MB */ +#define CONFIG_SYS_MAX_FLASH_SECT (35) /* max number of sectors on one chip */ +#endif + #ifdef CONFIG_AMD_LV800 #define PHYS_FLASH_SIZE 0x00100000 /* 1MB */ #define CONFIG_SYS_MAX_FLASH_SECT (19) /* max number of sectors on one chip */ -#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x0F0000) /* addr of environment */ #endif #ifdef CONFIG_AMD_LV400 #define PHYS_FLASH_SIZE 0x00080000 /* 512KB */ #define CONFIG_SYS_MAX_FLASH_SECT (11) /* max number of sectors on one chip */ -#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x070000) /* addr of environment */ #endif +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + PHYS_FLASH_SIZE - CONFIG_ENV_SIZE) /* starting addr of environment */ + /* timeout values are in ticks */ #define CONFIG_SYS_FLASH_ERASE_TOUT (5*CONFIG_SYS_HZ) /* Timeout for Flash Erase */ #define CONFIG_SYS_FLASH_WRITE_TOUT (5*CONFIG_SYS_HZ) /* Timeout for Flash Write */ -#define CONFIG_ENV_IS_IN_FLASH 1 -#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ - /*----------------------------------------------------------------------- * NAND flash settings */ -- 1.5.6.3

2 1

[U-Boot] [PATCH] soft_i2c.c add option for repeated start in i2c_read()
by Andrew Dyer 27 Jan '09

27 Jan '09

This patch adds a #define to optionally change the behaviour of i2c_read() in soft_i2c.c to send an I2C repeated start instead of a stop-start between sending the device address pointer write and reading back the data. The current behaviour is retained as the default. While most devices will work either way, I have a smart battery(*) that requires repeated start, and someone at some point found a device that required a stop-start. (*) http://www.inspired-energy.com/Standard_Products/NL2054/NL2054%20Rev1.0%20D… Signed-off-by: Andrew Dyer <adyer(a)righthandtech.com> --- README | 9 +++++++++ drivers/i2c/soft_i2c.c | 12 +++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/README b/README index 2a553c2..763fb7a 100644 --- a/README +++ b/README @@ -1496,6 +1496,15 @@ The following options need to be configured: Bus on the MPC8260. But it should be not so difficult to add this option to other architectures. + CONFIG_SOFT_I2C_READ_REPEATED_START + + defining this will force the i2c_read() function in + the soft_i2c driver to perform an I2C repeated start + between writing the address pointer and reading the + data. If this define is omitted the default behaviour + of doing a stop-start sequence will be used. Most I2C + devices can use either method, but some require one or + the other. - SPI Support: CONFIG_SPI diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index a27de5a..da6cec1 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -385,8 +385,18 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len) } shift -= 8; } - send_stop(); /* reportedly some chips need a full stop */ + + /* Some I2C chips need a stop/start sequence here, + * other chips don't work with a full stop and need + * only a start. Default behaviour is to send the + * stop/start sequence. + */ +#ifdef CONFIG_SOFT_I2C_READ_REPEATED_START send_start(); +#else + send_stop(); + send_start(); +#endif } /* * Send the chip address again, this time for a read cycle. -- 1.5.6.3

2 1

[U-Boot] Minor bug found in board/zylonite/lowlevel_init.S. 0x300 changed to 300.
by Tom Evans 27 Jan '09

27 Jan '09

I was looking through some board files based on the zylonite ones, and spotted the following changes. | $ git-log board/zylonite/lowlevel_init.S | ... | commit 951a954b77ef30df1f5c1b7b9b4312e783b2cbb4 | Merge: ac7d97d... bfc8125... | Author: Wolfgang Denk <wd(a)atlas.denx.de> | Date: Mon Mar 6 23:18:48 2006 +0100 | | Merge with /home/wd/git/u-boot/master | Code cleanup. | | commit 9d803d8c0b7fd9aeb2e708e9e48dd76d7287856d | Author: Markus Klotzb^(n)cher <Markus Klotzb^(n)mk(a)pollux.(none)> | Date: Wed Feb 8 18:56:28 2006 +0100 | | Changes: | | * lots of bugfixes in the assembler code | * reverted hardware.h back to original | * enabled hardware DRAM calibration | * GCC-4 fix: modified GLOBAL_DATA_POINTER macro | $ git diff | af646e865f4bc67623ca957dfe3d3e4a95ff0468.. | 9d803d8c0b7fd9aeb2e708e9e48dd76d7287856d | board/zylonite/lowlevel_init.S | ... | + /* mk: replaced with wait macro */ | +/* ldr r3, =OSCR /\* reset the OS Timer Count to zero *\/ */ | +/* mov r2, #0 */ | +/* str r2, [r3] */ | +/* ldr r4, =0x300 /\* really 0x2E1 is about 200usec, *\/ */ | +/* /\* so 0x300 should be plenty *\/ */ | +/* 1: */ | +/* ldr r2, [r3] */ | +/* cmp r4, r2 */ | +/* bgt 1b */ | + wait #300 Note that the linear code has been replaced with a macro. The comments above the code above state: /* Step 1: Wait for at least 200 microsedonds to allow internal */ /* clocks to settle. Only necessary after hard reset... */ The bug is that "=0x300" has been changed to "#300", and the latter is interpreted by the assembler as a decimal number. So the code is only waiting for 92us instead of 200 (13MHz clock divided by 4, divided by 300). I don't know if this causes any problems. The code doesn't match the comments, and it probably isn't following the manufacturer's specification for this timing either. Anyone else based of the Zylonite port might like to check their code. -- === Tom Evans Tom.Evans(a)ceos.com.au CEOS Pty Ltd www.ceos.com.au 3/17 Burgundy St, Heidelberg, Victoria 3084, Australia Phone (+61 3) 9458 4955 Direct Unsupported FAX (+61 3) 9458 4966 Mobile 0405 776 431

2 1

[U-Boot] [PATCH] drivers/net/e1000.c: missing terminator for supported devices
by Stefan Althoefer 27 Jan '09

27 Jan '09

Signed-off-by: Stefan Althoefer <stefan.althoefer(a)web.de> --- drivers/net/e1000.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 2dcaa2c..a52749d 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -82,6 +82,7 @@ static struct pci_device_id supported[] = { {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82540EM_LOM}, {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82541ER}, {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82541GI_LF}, + {} }; /* Function forward declarations */ -- 1.5.6

3 3

[U-Boot] nand sector size is zero in jffs2 cmds
by Derek Ou 27 Jan '09

27 Jan '09

Hi, all, When I tested jffs2 command for NAND, I found that jffs2_1pass.c:: jffs2_1pass_build_lists() fails at u32 nr_sectors = part->size/part->sector_size; because part->sector_size is zero. And cause the "### ERROR ### Please RESET the board ###" error when entering the for loop (i < nr_sectors), I think. It looks like the sector_size was not updated in mtdparts_init(). According to cmd_jffs2.c, the mtdparts_init in the #ifdef CONFIG_JFFS2_CMDLINE section calls the parse_mtdparts() and eventually reach the following lines in part_validate_nand(): nand = &nand_info[id->num]; part->sector_size = nand->erasesize; However, the other mtdparts_init(), which is not in the #ifdef CONFIG_JFFS2_CMDLINE section, does not call parse_mtdparts() and it may lead to the part->sector_size not initialized. I am not totally familiar with this jffs2 and nand code. Can someone review this? Thanks. Derek

3 7

[U-Boot] sprintf side effect, a bug?
by E Robertson 27 Jan '09

27 Jan '09

Hi, It seems that sprintf() is modifying at least two bytes from the source and I have duplicate this with different varibles. For instance, I have a mac address defined as unsigned char [6]: Doing the following sets the environment variable correctly, however bytes [0] and [1], are modified at the source. sprintf(env_ethaddr,"%02X:%02X:%02X:%02X:%02X:%02X", MACAddress[0], MACAddress[1], MACAddress[2], MACAddress[3], MACAddress[4], MACAddress[5]); Has anyone noticed this before? I don't think the machine matters but I am building for an arm at91.

3 4

[U-Boot] fat.c:707: warning: array subscript is above array bounds
by Wolfgang Denk 27 Jan '09

27 Jan '09

Hello, building U-Boot with recent toolchains (like GCC-4.3.2) results in this warning: fat.c: In function 'read_bootsectandvi': fat.c:707: warning: array subscript is above array bounds The respective code looks like this: fs/fat/fat.c: 705 /* Terminate fs_type string. Writing past the end of vistart 706 is ok - it's just the buffer. */ 707 vistart->fs_type[8] = '\0'; fs_type[] is declared in "include/fat.h": 143 typedef struct volume_info 144 { 145 __u8 drive_number; /* BIOS drive number */ 146 __u8 reserved; /* Unused */ 147 __u8 ext_boot_sign; /* 0x29 if fields below exist (DOS 3.3+) */ 148 __u8 volume_id[4]; /* Volume ID number */ 149 char volume_label[11]; /* Volume label */ 150 char fs_type[8]; /* Typically FAT12, FAT16, or FAT32 */ 151 /* Boot code comes next, all but 2 bytes to fill up sector */ 152 /* Boot sign comes last, 2 bytes */ 153 } volume_info; So the comment in fs/fat/fat.c is actually correct, writing beyond the end of the string is indeed uncritical here, but it is definitely not really nice either. I want to get rid of this warning message. Any ideas how to deal with this? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de "Am besten betrachten Sie Fehlermeldungen als eine Art Psycho-Test, mit dem herausgefunden werden soll, wie belastbar Sie sind." - Dr. R. Wonneberger, Kompaktführer LaTeX, Kap. 1.6: Fehlermeldungen

3 4

[U-Boot] Backup Booting
by Pawel Pastuszak 27 Jan '09

27 Jan '09

Hi Guys, I was wondering if there is any think like backup booting and secondary image for example lets say i am booting an image and it fails CRC check etc... i want to to validate that the backup image is good and then overwrite the current image with the backup image and be able to boot of the backup image. Second option of failure is image start booting and it fails in middle of booting maybe watchdog kicks in and reset the board. Is there a way to tell image fail booting and uses back instead. Pawel

2 6

[U-Boot] [PATCH] Fix gunzip in case of insufficient output buffer
by Matthias Fuchs 27 Jan '09

27 Jan '09

U-Boot's gunzip() function does not handle the return code of zlib's inflate() function correctly. gunzip() is implemented to uncompress all input data in one run. So the correct return code for the good case is Z_STREAM_END. In case of insufficient output buffer memory inflate returns Z_OK. For gunzip() this is an error. It also makes sense to me to call inflateEnd() also in case of an error. Signed-off-by: Matthias Fuchs <matthias.fuchs(a)esd-electronics.com> --- common/cmd_bootm.c | 2 +- lib_generic/gunzip.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index a8f85e9..9055672 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -350,7 +350,7 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress) printf (" Uncompressing %s ... ", type_name); if (gunzip ((void *)load, unc_len, (uchar *)image_start, &image_len) != 0) { - puts ("GUNZIP: uncompress or overwrite error " + puts ("GUNZIP: uncompress, out-of-mem or overwrite error " "- must RESET board to recover\n"); if (boot_progress) show_boot_progress (-6); diff --git a/lib_generic/gunzip.c b/lib_generic/gunzip.c index 74f0bf9..5bcf5b7 100644 --- a/lib_generic/gunzip.c +++ b/lib_generic/gunzip.c @@ -102,8 +102,9 @@ int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) s.next_out = dst; s.avail_out = dstlen; r = inflate(&s, Z_FINISH); - if (r != Z_OK && r != Z_STREAM_END) { + if (r != Z_STREAM_END) { printf ("Error: inflate() returned %d\n", r); + inflateEnd(&s); return (-1); } *lenp = s.next_out - (unsigned char *) dst; -- 1.5.6.3

2 2