summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-01-09 11:30:15 +0100
committerWolfgang Denk <wd@denx.de>2008-01-09 11:30:15 +0100
commit2eb6e01049886bdaadf11243e7c8cf674c34ed0b (patch)
tree01df3c1af8b933b6b313c21c258e637a990f835b /common
parentd2ba6bd8f431c51d8b381791091c133b1e6f8d02 (diff)
parent4985ca5af3767ffe13ea96e1dc26f88c81084414 (diff)
downloadtalos-obmc-uboot-2eb6e01049886bdaadf11243e7c8cf674c34ed0b.tar.gz
talos-obmc-uboot-2eb6e01049886bdaadf11243e7c8cf674c34ed0b.zip
Merge branch 'master' of git://www.denx.de/git/u-boot-arm
Diffstat (limited to 'common')
-rw-r--r--common/env_onenand.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/env_onenand.c b/common/env_onenand.c
index 66107f91f1..5888f75d89 100644
--- a/common/env_onenand.c
+++ b/common/env_onenand.c
@@ -64,7 +64,7 @@ void env_relocate_spec(void)
DECLARE_GLOBAL_DATA_PTR;
unsigned long env_addr;
int use_default = 0;
- int retlen;
+ size_t retlen;
env_addr = CFG_ENV_ADDR;
env_addr -= (unsigned long)onenand_chip.base;
@@ -96,7 +96,7 @@ int saveenv(void)
{
unsigned long env_addr = CFG_ENV_ADDR;
struct erase_info instr;
- int retlen;
+ size_t retlen;
instr.len = CFG_ENV_SIZE;
instr.addr = env_addr;
OpenPOWER on IntegriCloud