mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-30 08:03:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

cfi_flash: make the command u32 only

Browse Source 
This got changed by commit 93c56f212c
[cfi_flash: support of long cmd in U-boot.]

Long is the wrong type because it will behave differently on 64bit
machines in a way that is probably not expected. u32 should be
enough.

Cc: Alexey Korolev <akorolev@infradead.org>
Cc: Vasiliy Leonenko <vasiliy.leonenko@mail.ru>
Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
This commit is contained in:
Sebastian Siewior 2008-07-15 13:35:23 +02:00 committed by Wolfgang Denk
parent 31cfe57491
commit 7288f972fc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mtd/cfi_flash.c
View File

@ -301,7 +301,7 @@ static inline void flash_unmap(flash_info_t *info, flash_sect_t sect,
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* make a proper sized command based on the port and chip widths * make a proper sized command based on the port and chip widths
*/ */
static void flash_make_cmd (flash_info_t * info, ulong cmd, void *cmdbuf) static void flash_make_cmd(flash_info_t *info, u32 cmd, void *cmdbuf)
{ {
int i; int i;
int cword_offset; int cword_offset;
@ -316,9 +316,9 @@ static void flash_make_cmd (flash_info_t * info, ulong cmd, void *cmdbuf)
val = *((uchar*)&cmd + cword_offset); val = *((uchar*)&cmd + cword_offset);
#else #else
cp_offset = i - 1; cp_offset = i - 1;
val = *((uchar*)&cmd + sizeof(ulong) - cword_offset - 1); val = *((uchar*)&cmd + sizeof(u32) - cword_offset - 1);
#endif #endif
cp[cp_offset] = (cword_offset >= sizeof(ulong)) ? 0x00 : val; cp[cp_offset] = (cword_offset >= sizeof(u32)) ? 0x00 : val;
} }
} }
@ -433,7 +433,7 @@ static ulong flash_read_long (flash_info_t * info, flash_sect_t sect,
* Write a proper sized command to the correct address * Write a proper sized command to the correct address
*/ */
static void flash_write_cmd (flash_info_t * info, flash_sect_t sect, static void flash_write_cmd (flash_info_t * info, flash_sect_t sect,
uint offset, ulong cmd) uint offset, u32 cmd)
{ {
void *addr; void *addr;