minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 12:13:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace cleanup and marking broken code.

Browse Source 
Changes requested by maintainer Stefan Roese after
posting patch to U-boot mailing list.

Signed-off-by: William Juul <william.juul@tandberg.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
William Juul 2007-11-14 14:28:11 +01:00 committed by Scott Wood
parent 5e1dae5c3d
commit 3043c045d5
2 changed files with 57 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/cmd_doc.c
View File

@ -14,6 +14,11 @@
#include <linux/mtd/nftl.h> #include <linux/mtd/nftl.h>
#include <linux/mtd/doc2000.h> #include <linux/mtd/doc2000.h>
/*
* ! BROKEN !
*
* TODO: must be implemented and tested by someone with HW
*/
#if 0 #if 0
#ifdef CFG_DOC_SUPPORT_2000 #ifdef CFG_DOC_SUPPORT_2000
#define DoC_is_2000(doc) (doc->ChipID == DOC_ChipID_Doc2k) #define DoC_is_2000(doc) (doc->ChipID == DOC_ChipID_Doc2k)

46
common/cmd_nand.c
View File

@ -54,13 +54,9 @@ static int nand_dump(nand_info_t *nand, ulong off)
return 1; return 1;
} }
off &= ~(nand->writesize - 1); off &= ~(nand->writesize - 1);
#if 0
i = nand_read_raw(nand, buf, off, nand->writesize, nand->oobsize);
#else
size_t dummy; size_t dummy;
loff_t addr = (loff_t) off; loff_t addr = (loff_t) off;
i = nand->read(nand, addr, nand->writesize, &dummy, buf); i = nand->read(nand, addr, nand->writesize, &dummy, buf);
#endif
if (i < 0) { if (i < 0) {
printf("Error (%d) reading page %08lx\n", i, off); printf("Error (%d) reading page %08lx\n", i, off);
free(buf); free(buf);
@ -257,7 +253,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
if (strcmp(cmd, "erase") == 0 || strcmp(cmd, "scrub") == 0) { if (strcmp(cmd, "erase") == 0 || strcmp(cmd, "scrub") == 0) {
nand_erase_options_t opts; nand_erase_options_t opts;
/* "clean" at index 2 means request to write cleanmarker */ /* "clean" at index 2 means request to write cleanmarker */
int clean = !strcmp("clean", argv[2]); int clean = argc > 2 && !strcmp("clean", argv[2]);
int o = clean ? 3 : 2; int o = clean ? 3 : 2;
int scrub = !strcmp(cmd, "scrub"); int scrub = !strcmp(cmd, "scrub");
@ -267,7 +263,6 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return 1; return 1;
memset(&opts, 0, sizeof(opts)); memset(&opts, 0, sizeof(opts));
opts.offset = off; opts.offset = off;
opts.length = size; opts.length = size;
opts.jffs2 = clean; opts.jffs2 = clean;
@ -340,7 +335,13 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
opts.length = size; opts.length = size;
opts.offset = off; opts.offset = off;
opts.quiet = quiet; opts.quiet = quiet;
/* ret = nand_read_opts(nand, &opts); */ /*
* ! BROKEN !
*
* TODO: Function must be implemented
*
* ret = nand_read_opts(nand, &opts);
*/
} else { } else {
/* write */ /* write */
mtd_oob_ops_t opts; mtd_oob_ops_t opts;
@ -404,12 +405,17 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
if (!strcmp("status", argv[2])) if (!strcmp("status", argv[2]))
status = 1; status = 1;
} }
/*
if (status) { * ! BROKEN !
ulong off; *
/* ulong block_start = 0; * TODO: must be implemented and tested by someone with HW
int last_status = -1;
*/ */
#if 0
if (status) {
ulong block_start = 0;
ulong off;
int last_status = -1;
struct nand_chip *nand_chip = nand->priv; struct nand_chip *nand_chip = nand->priv;
/* check the WP bit */ /* check the WP bit */
nand_chip->cmdfunc (nand, NAND_CMD_STATUS, -1, -1); nand_chip->cmdfunc (nand, NAND_CMD_STATUS, -1, -1);
@ -418,7 +424,6 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
"NOT " : "")); "NOT " : ""));
for (off = 0; off < nand->size; off += nand->writesize) { for (off = 0; off < nand->size; off += nand->writesize) {
#if 0 /* must be fixed */
int s = nand_get_lock_status(nand, off); int s = nand_get_lock_status(nand, off);
/* print message only if status has changed /* print message only if status has changed
@ -437,18 +442,16 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
} }
last_status = s; last_status = s;
#endif
} }
} else { } else {
#if 0 /* must be fixed */
if (!nand_lock(nand, tight)) { if (!nand_lock(nand, tight)) {
puts("NAND flash successfully locked\n"); puts("NAND flash successfully locked\n");
} else { } else {
puts("Error locking NAND flash\n"); puts("Error locking NAND flash\n");
return 1; return 1;
} }
#endif
} }
#endif
return 0; return 0;
} }
@ -456,7 +459,12 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
if (arg_off_size(argc - 2, argv + 2, nand, &off, &size) < 0) if (arg_off_size(argc - 2, argv + 2, nand, &off, &size) < 0)
return 1; return 1;
#if 0 /* must be fixed */ /*
* ! BROKEN !
*
* TODO: must be implemented and tested by someone with HW
*/
#if 0
if (!nand_unlock(nand, off, size)) { if (!nand_unlock(nand, off, size)) {
puts("NAND flash successfully unlocked\n"); puts("NAND flash successfully unlocked\n");
} else { } else {
@ -542,6 +550,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
puts ("** Unknown image type\n"); puts ("** Unknown image type\n");
return 1; return 1;
} }
show_boot_progress (57);
r = nand_read(nand, offset, &cnt, (u_char *) addr); r = nand_read(nand, offset, &cnt, (u_char *) addr);
if (r) { if (r) {
@ -887,8 +896,7 @@ int do_nand (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
ret = nand_legacy_rw (nand_dev_desc + curr_device, ret = nand_legacy_rw (nand_dev_desc + curr_device,
cmd, off, size, cmd, off, size,
&total, &total, (u_char *) addr);
(u_char *) addr);
printf (" %d bytes %s: %s\n", total, printf (" %d bytes %s: %s\n", total,
(cmd & NANDRW_READ) ? "read" : "written", (cmd & NANDRW_READ) ? "read" : "written",