diff options
| author | Thomas Huth <thuth@linux.vnet.ibm.com> | 2011-09-28 13:45:55 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@linux.vnet.ibm.com> | 2011-10-12 12:50:05 +0200 |
| commit | 4f6e2c9efe9e5474ef47f667a71b14b812cbd74e (patch) | |
| tree | 92801ea4cbcbe39bb924ddfcf1533982ba491e10 /board-js2x | |
| parent | f90c45697bc340328ecdb5e04ff54be106ca4468 (diff) | |
| download | SLOF-4f6e2c9efe9e5474ef47f667a71b14b812cbd74e.zip SLOF-4f6e2c9efe9e5474ef47f667a71b14b812cbd74e.tar.gz SLOF-4f6e2c9efe9e5474ef47f667a71b14b812cbd74e.tar.bz2 | |
Fix compiler warnings
GCC 4.6 complains about unused-but-set variables - which can safely be removed
in our cases.
Also fixed a strict-aliasing problem in rtas_flash.c of board-js2x.
Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Diffstat (limited to 'board-js2x')
| -rw-r--r-- | board-js2x/rtas/rtas_flash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board-js2x/rtas/rtas_flash.c b/board-js2x/rtas/rtas_flash.c index 82c1745..7d93343 100644 --- a/board-js2x/rtas/rtas_flash.c +++ b/board-js2x/rtas/rtas_flash.c @@ -34,7 +34,7 @@ static uint64_t size; static uint64_t flashOffset; -unsigned short manage_flash_buffer[BUFSIZE]; +unsigned char manage_flash_buffer[BUFSIZE*2]; unsigned long check_flash_image(unsigned long rombase, unsigned long length, unsigned long start_crc); @@ -253,7 +253,7 @@ copy_flash(short mode) for (blockCnt = 0; blockCnt <= FLASHSIZE; blockCnt += BUFSIZE) { uint64_t *srcPtr = (uint64_t *)(flash + blockCnt); - uint64_t *destPtr = (uint64_t *)((void*)manage_flash_buffer); + uint64_t *destPtr = (uint64_t *)manage_flash_buffer; uint64_t cnt = BUFSIZE / 8; if (bmc_set_flashside(mode) != mode) { return -1; @@ -333,7 +333,7 @@ rtas_ibm_manage_flash_image(rtas_args_t *rtas_args) result = copy_flash(mode); bmc_set_flashside(mode); enter_data_mode(); - rtas_args->args[rtas_args->nargs] = 0; + rtas_args->args[rtas_args->nargs] = result; } /** |