diff options
| author | Sebastian Siewior <bigeasy@linutronix.de> | 2008-07-15 13:35:23 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-15 21:42:04 +0200 |
| commit | 7288f972fcaee14a9741cb08c8688a23874b4a2e (patch) | |
| tree | f9f8ecceca9bd5f75190312b8861330476b84439 | |
| parent | 31cfe57491b183acae575d486729e158f016c27b (diff) | |
| download | u-boot-midas-7288f972fcaee14a9741cb08c8688a23874b4a2e.tar.gz u-boot-midas-7288f972fcaee14a9741cb08c8688a23874b4a2e.tar.bz2 u-boot-midas-7288f972fcaee14a9741cb08c8688a23874b4a2e.zip | |
cfi_flash: make the command u32 only
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>
| -rw-r--r-- | drivers/mtd/cfi_flash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index c0ea97be70..4340b1b5c7 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -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 */ -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 cword_offset; @@ -316,9 +316,9 @@ static void flash_make_cmd (flash_info_t * info, ulong cmd, void *cmdbuf) val = *((uchar*)&cmd + cword_offset); #else cp_offset = i - 1; - val = *((uchar*)&cmd + sizeof(ulong) - cword_offset - 1); + val = *((uchar*)&cmd + sizeof(u32) - cword_offset - 1); #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 */ static void flash_write_cmd (flash_info_t * info, flash_sect_t sect, - uint offset, ulong cmd) + uint offset, u32 cmd) { void *addr; |