diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2008-02-15 12:59:15 +0000 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2008-02-15 12:59:15 +0000 |
| commit | ae92069abecc278d7b8de88ffa62de0c2c0ed2bf (patch) | |
| tree | 2509461053fa9e58c6d2b4750727f07b646965d8 /common | |
| parent | e42d2b0479ff5fd9f041e8dfa52105d521fa9264 (diff) | |
| parent | 9604b6e53ddae4fe00a488cbcd6b0e6cb344bccc (diff) | |
| download | u-boot-imx-ae92069abecc278d7b8de88ffa62de0c2c0ed2bf.zip u-boot-imx-ae92069abecc278d7b8de88ffa62de0c2c0ed2bf.tar.gz u-boot-imx-ae92069abecc278d7b8de88ffa62de0c2c0ed2bf.tar.bz2 | |
Merge branch '080116_at91cap9' of git://linux-arm.org/u-boot-armdev
Diffstat (limited to 'common')
| -rw-r--r-- | common/env_dataflash.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/common/env_dataflash.c b/common/env_dataflash.c index 93fff29..8a94432 100644 --- a/common/env_dataflash.c +++ b/common/env_dataflash.c @@ -44,22 +44,22 @@ extern uchar default_environment[]; uchar env_get_char_spec (int index) { uchar c; - read_dataflash (CFG_ENV_ADDR+index+offsetof(env_t,data),1,&c); + read_dataflash(CFG_ENV_ADDR + index + offsetof(env_t,data), + 1, (char *)&c); return (c); } void env_relocate_spec (void) { - read_dataflash (CFG_ENV_ADDR,CFG_ENV_SIZE,(uchar *)env_ptr); + read_dataflash(CFG_ENV_ADDR, CFG_ENV_SIZE, (char *)env_ptr); } int saveenv(void) { -/* env must be copied to do not alter env structure in memory*/ -unsigned char temp[CFG_ENV_SIZE]; -int i; + /* env must be copied to do not alter env structure in memory*/ + unsigned char temp[CFG_ENV_SIZE]; memcpy(temp, env_ptr, CFG_ENV_SIZE); - return write_dataflash (CFG_ENV_ADDR, (unsigned long)temp, CFG_ENV_SIZE); + return write_dataflash(CFG_ENV_ADDR, (unsigned long)temp, CFG_ENV_SIZE); } /************************************************************************ @@ -77,13 +77,14 @@ int env_init(void) AT91F_DataflashInit(); /* prepare for DATAFLASH read/write */ /* read old CRC */ - read_dataflash (CFG_ENV_ADDR+offsetof(env_t,crc),sizeof(ulong),&crc); + read_dataflash(CFG_ENV_ADDR + offsetof(env_t, crc), + sizeof(ulong), (char *)&crc); new = 0; len = ENV_SIZE; off = offsetof(env_t,data); while (len > 0) { int n = (len > sizeof(buf)) ? sizeof(buf) : len; - read_dataflash (CFG_ENV_ADDR+off,n , buf); + read_dataflash(CFG_ENV_ADDR + off, n, (char *)buf); new = crc32 (new, buf, n); len -= n; off += n; |