diff options
| author | Wolfgang Denk <[email protected]> | 2008-04-30 23:04:51 +0200 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2008-04-30 23:04:51 +0200 |
| commit | fed4de0135fdc13565704669cdf80902bbfe3c42 (patch) | |
| tree | b8fc14a0c94687ac766eba56cb8ec445dfad0668 /common | |
| parent | 42ffcec3f9eba010a662d5b42981812b6bebfb9a (diff) | |
| parent | 12bc4e94251c369c529ffa505cf58b148c372f7f (diff) | |
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Diffstat (limited to 'common')
| -rw-r--r-- | common/env_nand.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/env_nand.c b/common/env_nand.c index 0dddddf0a1f..49742f5bfb5 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -102,7 +102,7 @@ uchar env_get_char_spec (int index) int env_init(void) { #if defined(ENV_IS_EMBEDDED) - ulong total; + size_t total; int crc1_ok = 0, crc2_ok = 0; env_t *tmp_env1, *tmp_env2; @@ -188,7 +188,7 @@ int saveenv(void) #else /* ! CFG_ENV_OFFSET_REDUND */ int saveenv(void) { - ulong total; + size_t total; int ret = 0; puts ("Erasing Nand..."); @@ -268,7 +268,7 @@ void env_relocate_spec (void) void env_relocate_spec (void) { #if !defined(ENV_IS_EMBEDDED) - ulong total; + size_t total; int ret; total = CFG_ENV_SIZE; |