July 2010 - U-Boot

[U-Boot] [PATCH] board/purple/flash.c: removed unneded test
by Frans Meulenbroeks 09 Aug '10

09 Aug '10

removed part of a test which tested for a var that did not change within the loop and hence was superfluous Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks(a)gmail.com> --- board/purple/flash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/purple/flash.c b/board/purple/flash.c index 37c7bec..299171d 100644 --- a/board/purple/flash.c +++ b/board/purple/flash.c @@ -490,7 +490,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) last = get_timer(0); /* Start erase on unprotected sectors */ - for (sect = s_first; sect<=s_last && rcode == 0; sect++) { + for (sect = s_first; sect<=s_last; sect++) { if (info->protect[sect] != 0) /* protected, skip it */ continue; -- 1.6.4.2

3 6

[U-Boot] [PATCH 1/2] various cmd_* files: remove the command name from the help message
by Frans Meulenbroeks 09 Aug '10

09 Aug '10

removed the command name from the help message as it is already printed. for cmd_mmc also rewrote the message a little bit Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks(a)gmail.com> --- common/cmd_cramfs.c | 4 ++-- common/cmd_dataflash_mmc_mux.c | 2 +- common/cmd_mgdisk.c | 2 +- common/cmd_mmc.c | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/common/cmd_cramfs.c b/common/cmd_cramfs.c index ab10450..8c86dc5 100644 --- a/common/cmd_cramfs.c +++ b/common/cmd_cramfs.c @@ -199,14 +199,14 @@ int do_cramfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /***************************************************/ U_BOOT_CMD( cramfsload, 3, 0, do_cramfs_load, - "cramfsload\t- load binary file from a filesystem image", + "load binary file from a filesystem image", "[ off ] [ filename ]\n" " - load binary file from address 'cramfsaddr'\n" " with offset 'off'\n" ); U_BOOT_CMD( cramfsls, 2, 1, do_cramfs_ls, - "cramfsls\t- list files in a directory (default /)", + "list files in a directory (default /)", "[ directory ]\n" " - list files in a directory.\n" ); diff --git a/common/cmd_dataflash_mmc_mux.c b/common/cmd_dataflash_mmc_mux.c index de4e676..cfa1101 100644 --- a/common/cmd_dataflash_mmc_mux.c +++ b/common/cmd_dataflash_mmc_mux.c @@ -59,7 +59,7 @@ static int mmc_nspi (const char *s) U_BOOT_CMD( dataflash_mmc_mux, 2, 1, do_dataflash_mmc_mux, - "dataflash_mmc_mux\t- enable or disable MMC or SPI\n", + "enable or disable MMC or SPI\n", "[mmc, spi]\n" " - enable or disable MMC or SPI" ); diff --git a/common/cmd_mgdisk.c b/common/cmd_mgdisk.c index c2d5217..dfd0142 100644 --- a/common/cmd_mgdisk.c +++ b/common/cmd_mgdisk.c @@ -62,7 +62,7 @@ int do_mg_disk_cmd (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) U_BOOT_CMD( mgd, 5, 0, do_mg_disk_cmd, - "mgd - mgine m[g]flash command\n", + "mgine m[g]flash command\n", ": mgine mflash IO mode (disk) command\n" " - initialize : mgd init\n" " - random read : mgd read [from] [to] [size]\n" diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index e5f5e94..30e6e0b 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -131,7 +131,9 @@ int do_mmcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } U_BOOT_CMD(mmcinfo, 2, 0, do_mmcinfo, - "mmcinfo <dev num>-- display MMC info", + "display MMC info", + "<dev num>\n + " - device number of the device to dislay info of\n" "" ); -- 1.6.4.2

2 3

[U-Boot] [PATCH] tools/env/fw_printenv: Make redundant env work on locked flashes also
by Detlev Zundel 09 Aug '10

09 Aug '10

The invalidation of the old environment instance did not work for flashes supporting hardware locking. Now we unlock/lock around this update also. Signed-off-by: Detlev Zundel <dzu(a)denx.de> --- tools/env/fw_env.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) Please note that this solution which does not do any checking of the return codes is inline with the locking/unlocking in other parts of the code. For a sensible return code checking we would need to know if locking is supported and wanted. As I currently do not see that the MTD layer exposes the first information I fail to see an automatic way of doing this. Using a command line option to request locking/unlocking looks like agood way to handle this. Locking/unlocking would the need to be explicitely requested by the user. When the user does not do this on chips needing it, a read-only error message would result. What do other people think about this? diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 04f3bf0..8ff7052 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2008 + * (C) Copyright 2000-2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. * * (C) Copyright 2008 @@ -899,7 +899,10 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, static int flash_flag_obsolete (int dev, int fd, off_t offset) { int rc; + struct erase_info_user erase; + erase.start = DEVOFFSET (dev); + erase.length = DEVESIZE (dev); /* This relies on the fact, that obsolete_flag == 0 */ rc = lseek (fd, offset, SEEK_SET); if (rc < 0) { @@ -907,7 +910,9 @@ static int flash_flag_obsolete (int dev, int fd, off_t offset) DEVNAME (dev)); return rc; } + ioctl (fd, MEMUNLOCK, &erase); rc = write (fd, &obsolete_flag, sizeof (obsolete_flag)); + ioctl (fd, MEMLOCK, &erase); if (rc < 0) perror ("Could not set obsolete flag"); -- 1.6.2.5

2 1

[U-Boot] [PATCH] flash_protect: check for NULL flash info
by Mike Frysinger 09 Aug '10

09 Aug '10

If a flash is unable to be detected, and then someone calls flash_protect on it (like the common code does in flash_init), the flash_protect logic will dereference a NULL pointer. Since flash_protect already does sanity checking on the info structs, add a NULL pointer check in there. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- common/flash.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common/flash.c b/common/flash.c index eb4b2f5..683978e 100644 --- a/common/flash.c +++ b/common/flash.c @@ -43,15 +43,18 @@ extern flash_info_t flash_info[]; /* info for FLASH chips */ void flash_protect (int flag, ulong from, ulong to, flash_info_t *info) { - ulong b_end = info->start[0] + info->size - 1; /* bank end address */ - short s_end = info->sector_count - 1; /* index of last sector */ + ulong b_end; + short s_end; int i; /* Do nothing if input data is bad. */ - if (info->sector_count == 0 || info->size == 0 || to < from) { + if (!info || info->sector_count == 0 || info->size == 0 || to < from) { return; } + s_end = info->sector_count - 1; /* index of last sector */ + b_end = info->start[0] + info->size - 1; /* bank end address */ + debug ("flash_protect %s: from 0x%08lX to 0x%08lX\n", (flag & FLAG_PROTECT_SET) ? "ON" : (flag & FLAG_PROTECT_CLEAR) ? "OFF" : "???", -- 1.7.2

2 1

[U-Boot] [PATCH] ext2fs: Fix optimization bug for doubly-indirect block pointers
by Aaron Pace 09 Aug '10

09 Aug '10

Fix optimization bug for doubly-indirect block pointers Doubly-indirect block numbers are compared against the first-level indirect block when checking for a cached copy. This is causing the doubly-indirect block to be re-read each time it is accessed. Repairing this reduces load time for a 70M file from 72 seconds to 38 seconds. Signed-off-by: Aaron Pace <Aaron.Pace(a)alcatel-lucent.com> --- fs/ext2/ext2fs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c index 4b391d6..a88cf87 100644 --- a/fs/ext2/ext2fs.c +++ b/fs/ext2/ext2fs.c @@ -364,7 +364,7 @@ static int ext2fs_read_block (ext2fs_node_t node, int fileblock) { indir2_size = blksz; } if ((__le32_to_cpu (indir1_block[rblock / perblock]) << - log2_blksz) != indir1_blkno) { + log2_blksz) != indir2_blkno) { status = ext2fs_devread (__le32_to_cpu(indir1_block[rblock / perblock]) << log2_blksz, 0, blksz, (char *) indir2_block); -- 1.5.4.3

2 1

[U-Boot] [PATCH] getenv_f(): fix handling of too short buffers
by Wolfgang Denk 09 Aug '10

09 Aug '10

Fix error handling in getenv_f() when the user provided buffer is too short to hold the variable name; make sure to truncate and NUL-terminate without overwriting the buffer limits. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- common/cmd_nvedit.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 16d5ff7..fd5320d 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -557,13 +557,19 @@ int getenv_f(char *name, char *buf, unsigned len) } if ((val=envmatch((uchar *)name, i)) < 0) continue; + /* found; copy out */ - n = 0; - while ((len > n++) && (*buf++ = env_get_char(val++)) != '\0') - ; - if (len == n) - *buf = '\0'; - return (n); + for (n=0; n<len; ++n, ++buf) { + if ((*buf = env_get_char(val++)) == '\0') + return n; + } + + if (n) + *--buf = '\0'; + + printf("env_buf too small [%d]\n", len); + + return n; } return (-1); } -- 1.7.1.1

1 1

[U-Boot] [PATCH] dataflash mmc mux: use common cmd_usage function
by Mike Frysinger 09 Aug '10

09 Aug '10

Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- note: i have no target that uses it, so i havent compile tested this. but the change is straight forward enough ... common/cmd_dataflash_mmc_mux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/cmd_dataflash_mmc_mux.c b/common/cmd_dataflash_mmc_mux.c index 97e303e..77cb9ba 100644 --- a/common/cmd_dataflash_mmc_mux.c +++ b/common/cmd_dataflash_mmc_mux.c @@ -41,7 +41,7 @@ int do_dataflash_mmc_mux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) AT91F_GetMuxStatus () ? "MMC" : "SPI"); return 0; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } return 0; -- 1.7.2

2 2

[U-Boot] [PATCH] mflash: use common cmd_usage function
by Mike Frysinger 09 Aug '10

09 Aug '10

Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- note: i have no target that uses it, so i havent compile tested this. but the change is straight forward enough ... common/cmd_mgdisk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/cmd_mgdisk.c b/common/cmd_mgdisk.c index 3ba62f6..03bed88 100644 --- a/common/cmd_mgdisk.c +++ b/common/cmd_mgdisk.c @@ -54,7 +54,7 @@ int do_mg_disk_cmd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 1; break; default: - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } return 0; -- 1.7.2

3 4

[U-Boot] [PATCH] print_buffer: optimize & shrink
by Mike Frysinger 09 Aug '10

09 Aug '10

Applying a little creative format string allows us to shrink the initial data read & display loop by only calling printf once. Re-using the local data buffer to generate the string we want to display then allows us to output everything with just one printf call instead of multiple calls to the putc function. The local stack buffer needs increasing by 1 byte, but the resulting code shrink and speed up is worth it I think. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- lib/display_options.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/lib/display_options.c b/lib/display_options.c index a711425..20319e6 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -101,7 +101,7 @@ void print_size(unsigned long long size, const char *s) #define DEFAULT_LINE_LENGTH_BYTES (16) int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen) { - uint8_t linebuf[MAX_LINE_LENGTH_BYTES]; + uint8_t linebuf[MAX_LINE_LENGTH_BYTES + 1]; uint32_t *uip = (void*)linebuf; uint16_t *usp = (void*)linebuf; uint8_t *ucp = (void*)linebuf; @@ -121,24 +121,23 @@ int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen) /* Copy from memory into linebuf and print hex values */ for (i = 0; i < linelen; i++) { - if (width == 4) { - uip[i] = *(volatile uint32_t *)data; - printf(" %08x", uip[i]); - } else if (width == 2) { - usp[i] = *(volatile uint16_t *)data; - printf(" %04x", usp[i]); - } else { - ucp[i] = *(volatile uint8_t *)data; - printf(" %02x", ucp[i]); - } + uint32_t x; + if (width == 4) + x = uip[i] = *(volatile uint32_t *)data; + else if (width == 2) + x = usp[i] = *(volatile uint16_t *)data; + else + x = ucp[i] = *(volatile uint8_t *)data; + printf(" %0*x", width * 2, x); data += width; } /* Print data in ASCII characters */ - puts(" "); for (i = 0; i < linelen * width; i++) - putc(isprint(ucp[i]) && (ucp[i] < 0x80) ? ucp[i] : '.'); - putc ('\n'); + if (!isprint(ucp[i]) || ucp[i] >= 0x80) + ucp[i] = '.'; + ucp[i] = '\0'; + printf(" %s\n", ucp); /* update references */ addr += linelen * width; -- 1.7.2

2 1

[U-Boot] [PATCH] cmd editing: optimize/shrink output blanking
by Mike Frysinger 09 Aug '10

09 Aug '10

No need to output spaces 1 char at a time in a loop when the printf code can do the same thing with the right format string. This shrinks things and gives a nice speed up when killing off lines more than a byte or two as printf will send out the buffer in one big chunk. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- common/main.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/common/main.c b/common/main.c index 20090ee..40617f5 100644 --- a/common/main.c +++ b/common/main.c @@ -643,12 +643,10 @@ static void cread_print_hist_list(void) #define ERASE_TO_EOL() { \ if (num < eol_num) { \ - int tmp; \ - for (tmp = num; tmp < eol_num; tmp++) \ - getcmd_putch(' '); \ - while (tmp-- > num) \ + printf("%*s", (int)(eol_num - num), ""); \ + do { \ getcmd_putch(CTL_BACKSPACE); \ - eol_num = num; \ + } while (--eol_num > num); \ } \ } -- 1.7.2

2 1