diff options
| author | Tom Rini <trini@ti.com> | 2013-05-31 18:28:47 -0400 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-05-31 18:28:47 -0400 | 
| commit | d6639d10dbfa42dc888f8917012550b632a88959 (patch) | |
| tree | 3c971dcfad4d7ad58570e8d5b0318f58370f9d3d /common/env_onenand.c | |
| parent | 3da0e5750b24a9491058df6126c7be577a276c09 (diff) | |
| parent | dfe64e2c89731a3f9950d7acd8681b68df2bae03 (diff) | |
| download | olio-uboot-2014.01-d6639d10dbfa42dc888f8917012550b632a88959.tar.xz olio-uboot-2014.01-d6639d10dbfa42dc888f8917012550b632a88959.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'common/env_onenand.c')
| -rw-r--r-- | common/env_onenand.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/common/env_onenand.c b/common/env_onenand.c index faa903d2f..e8bde3726 100644 --- a/common/env_onenand.c +++ b/common/env_onenand.c @@ -68,7 +68,7 @@ void env_relocate_spec(void)  	/* Check OneNAND exist */  	if (mtd->writesize)  		/* Ignore read fail */ -		mtd->read(mtd, env_addr, ONENAND_MAX_ENV_SIZE, +		mtd_read(mtd, env_addr, ONENAND_MAX_ENV_SIZE,  				&retlen, (u_char *)buf);  	else  		mtd->writesize = MAX_ONENAND_PAGESIZE; @@ -113,12 +113,12 @@ int saveenv(void)  #endif  	instr.addr = env_addr;  	instr.mtd = mtd; -	if (mtd->erase(mtd, &instr)) { +	if (mtd_erase(mtd, &instr)) {  		printf("OneNAND: erase failed at 0x%08llx\n", env_addr);  		return 1;  	} -	if (mtd->write(mtd, env_addr, ONENAND_MAX_ENV_SIZE, &retlen, +	if (mtd_write(mtd, env_addr, ONENAND_MAX_ENV_SIZE, &retlen,  			(u_char *)&env_new)) {  		printf("OneNAND: write failed at 0x%llx\n", instr.addr);  		return 2; |