diff options
| author | Stefan Roese <sr@denx.de> | 2008-08-12 20:39:27 +0200 | 
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-08-12 20:39:27 +0200 | 
| commit | 9939ffd5fbf1f5aff4d8172531d4fc33797c62c8 (patch) | |
| tree | 40e9295368c82a9c7f2b09e7b1fb76c2c44df0ce /common/env_onenand.c | |
| parent | 1c7015100a620582224f25eb057573a0fe147648 (diff) | |
| parent | cd82919e6c8a73b363a26f34b734923844e52d1c (diff) | |
| download | olio-uboot-2014.01-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.tar.xz olio-uboot-2014.01-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.zip | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
Diffstat (limited to 'common/env_onenand.c')
| -rw-r--r-- | common/env_onenand.c | 3 | 
1 files changed, 0 insertions, 3 deletions
| diff --git a/common/env_onenand.c b/common/env_onenand.c index ad5b1d7aa..dbd0883fa 100644 --- a/common/env_onenand.c +++ b/common/env_onenand.c @@ -66,7 +66,6 @@ void env_relocate_spec(void)  	size_t retlen;  	env_addr = CFG_ENV_ADDR; -	env_addr -= (unsigned long) onenand_chip.base;  	/* Check OneNAND exist */  	if (onenand_mtd.oobblock) @@ -101,7 +100,6 @@ int saveenv(void)  	instr.len = CFG_ENV_SIZE;  	instr.addr = env_addr; -	instr.addr -= (unsigned long)onenand_chip.base;  	if (onenand_erase(&onenand_mtd, &instr)) {  		printf("OneNAND: erase failed at 0x%08lx\n", env_addr);  		return 1; @@ -111,7 +109,6 @@ int saveenv(void)  	env_ptr->crc =  	    crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd)); -	env_addr -= (unsigned long)onenand_chip.base;  	if (onenand_write(&onenand_mtd, env_addr, onenand_mtd.oobblock, &retlen,  	     (u_char *) env_ptr)) {  		printf("OneNAND: write failed at 0x%08x\n", instr.addr); |