diff options
Diffstat (limited to 'common/cmd_nand.c')
| -rw-r--r-- | common/cmd_nand.c | 18 | 
1 files changed, 9 insertions, 9 deletions
| diff --git a/common/cmd_nand.c b/common/cmd_nand.c index f20223cff..8b1e01ae8 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -62,8 +62,8 @@ static int nand_dump(nand_info_t *nand, ulong off, int only_oob, int repeat)  	ops.oobbuf = oobbuf;  	ops.len = nand->writesize;  	ops.ooblen = nand->oobsize; -	ops.mode = MTD_OOB_RAW; -	i = nand->read_oob(nand, addr, &ops); +	ops.mode = MTD_OPS_RAW; +	i = mtd_read_oob(nand, addr, &ops);  	if (i < 0) {  		printf("Error (%d) reading page %08lx\n", i, off);  		free(datbuf); @@ -404,13 +404,13 @@ static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count,  			.oobbuf = ((u8 *)addr) + nand->writesize,  			.len = nand->writesize,  			.ooblen = nand->oobsize, -			.mode = MTD_OOB_RAW +			.mode = MTD_OPS_RAW  		};  		if (read) -			ret = nand->read_oob(nand, off, &ops); +			ret = mtd_read_oob(nand, off, &ops);  		else -			ret = nand->write_oob(nand, off, &ops); +			ret = mtd_write_oob(nand, off, &ops);  		if (ret) {  			printf("%s: error at offset %llx, ret %d\n", @@ -715,13 +715,13 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])  			mtd_oob_ops_t ops = {  				.oobbuf = (u8 *)addr,  				.ooblen = rwsize, -				.mode = MTD_OOB_RAW +				.mode = MTD_OPS_RAW  			};  			if (read) -				ret = nand->read_oob(nand, off, &ops); +				ret = mtd_read_oob(nand, off, &ops);  			else -				ret = nand->write_oob(nand, off, &ops); +				ret = mtd_write_oob(nand, off, &ops);  		} else if (raw) {  			ret = raw_access(nand, addr, off, pagecount, read);  		} else { @@ -764,7 +764,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])  		while (argc > 0) {  			addr = simple_strtoul(*argv, NULL, 16); -			if (nand->block_markbad(nand, addr)) { +			if (mtd_block_markbad(nand, addr)) {  				printf("block 0x%08lx NOT marked "  					"as bad! ERROR %d\n",  					addr, ret); |