diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-11-15 08:58:00 +0000 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-11-15 08:58:00 +0000 |
| commit | 2ae64f5135e51bb18753884d1265b99e89b5aedd (patch) | |
| tree | 648b0acba18ee1b53744fcb22dc0e73dec79e38c | |
| parent | 2db916e14410e3ec1738508c7bf4dfeb2b299ae7 (diff) | |
| download | u-boot-imx-2ae64f5135e51bb18753884d1265b99e89b5aedd.zip u-boot-imx-2ae64f5135e51bb18753884d1265b99e89b5aedd.tar.gz u-boot-imx-2ae64f5135e51bb18753884d1265b99e89b5aedd.tar.bz2 | |
Remove warnings re CONFIG_EXTRA_ENV_SETTINGS
Remove warnings re onenand_read() & write()
| -rw-r--r-- | common/env_onenand.c | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | include/configs/apollon.h | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/common/env_onenand.c b/common/env_onenand.c index 66107f9..5888f75 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 index 578153c..7727bc3 100644..100755 --- 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" |