From 2ae64f5135e51bb18753884d1265b99e89b5aedd Mon Sep 17 00:00:00 2001
From: Peter Pearse <peter.pearse@arm.com>
Date: Thu, 15 Nov 2007 08:58:00 +0000
Subject: [PATCH] Remove warnings re CONFIG_EXTRA_ENV_SETTINGS Remove warnings
re onenand_read() & write()
---
common/env_onenand.c | 4 ++--
include/configs/apollon.h | 18 +++++++++---------
2 files changed, 11 insertions(+), 11 deletions(-)
mode change 100644 => 100755 include/configs/apollon.h
diff --git a/common/env_onenand.c b/common/env_onenand.c
index 66107f91f17..5888f75d895 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;
diff --git a/include/configs/apollon.h b/include/configs/apollon.h
old mode 100644
new mode 100755
index 578153c8bf9..7727bc3e291
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -148,15 +148,15 @@
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
- "Image=tftp 0x80008000 Image\; go 0x80008000\0" \
- "zImage=tftp 0x80180000 zImage\; go 0x80180000\0" \
- "uImage=tftp 0x80180000 uImage\; bootm 0x80180000\0" \
- "uboot=tftp 0x80008000 u-boot.bin\; go 0x80008000\0" \
- "xloader=tftp 0x80180000 x-load.bin\; cp.w 0x80180000 0x00000400 0x1000\; go 0x00000400\0" \
- "syncmode50=mw.w 0x1e442 0xc0c4\; mw 0x6800a060 0xe30d1201\0" \
- "syncmode=mw.w 0x1e442 0xe0f4\; mw 0x6800a060 0xe30d1201\0" \
- "norboot=cp32 0x18040000 0x80008000 0x200000\; go 0x80008000\0" \
- "oneboot=onenand read 0x80008000 0x40000 0x200000\; go 0x80008000\0"\
+ "Image=tftp 0x80008000 Image; go 0x80008000\0" \
+ "zImage=tftp 0x80180000 zImage; go 0x80180000\0" \
+ "uImage=tftp 0x80180000 uImage; bootm 0x80180000\0" \
+ "uboot=tftp 0x80008000 u-boot.bin; go 0x80008000\0" \
+ "xloader=tftp 0x80180000 x-load.bin; cp.w 0x80180000 0x00000400 0x1000; go 0x00000400\0" \
+ "syncmode50=mw.w 0x1e442 0xc0c4; mw 0x6800a060 0xe30d1201\0" \
+ "syncmode=mw.w 0x1e442 0xe0f4; mw 0x6800a060 0xe30d1201\0" \
+ "norboot=cp32 0x18040000 0x80008000 0x200000; go 0x80008000\0" \
+ "oneboot=onenand read 0x80008000 0x40000 0x200000; go 0x80008000\0"\
"onesyncboot=run syncmode oneboot\0" \
"bootcmd=run uboot\0"
--
GitLab