diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2007-01-19 12:06:32 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-01-19 12:06:32 +0100 |
| commit | 15e5025a7337df1ab94549bdd79db08083868b85 (patch) | |
| tree | 19bd9e410903a8a7e7a23f3dfe7262b28e09d3d9 /drivers/cfi_flash.c | |
| parent | 9d8d5a5bfb64768f29a0cb47fc37cd6f4c40e276 (diff) | |
| parent | cb4820725e9fc409c5cbc8e83054a6ed522d2111 (diff) | |
| download | blackbird-obmc-uboot-15e5025a7337df1ab94549bdd79db08083868b85.tar.gz blackbird-obmc-uboot-15e5025a7337df1ab94549bdd79db08083868b85.zip | |
Merge with /home/hs/SC3/u-boot-dev
Diffstat (limited to 'drivers/cfi_flash.c')
| -rw-r--r-- | drivers/cfi_flash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/cfi_flash.c b/drivers/cfi_flash.c index 8dc44997b8..665d8e7649 100644 --- a/drivers/cfi_flash.c +++ b/drivers/cfi_flash.c @@ -860,7 +860,7 @@ static int flash_full_status_check (flash_info_t * info, flash_sect_t sector, */ static void flash_add_byte (flash_info_t * info, cfiword_t * cword, uchar c) { -#if defined(__LITTLE_ENDIAN) +#if defined(__LITTLE_ENDIAN) && !defined(CONFIG_SOLIDCARD3) unsigned short w; unsigned int l; unsigned long long ll; @@ -880,7 +880,7 @@ static void flash_add_byte (flash_info_t * info, cfiword_t * cword, uchar c) #endif break; case FLASH_CFI_32BIT: -#if defined(__LITTLE_ENDIAN) +#if defined(__LITTLE_ENDIAN) && !defined(CONFIG_SOLIDCARD3) l = c; l <<= 24; cword->l = (cword->l >> 8) | l; @@ -889,7 +889,7 @@ static void flash_add_byte (flash_info_t * info, cfiword_t * cword, uchar c) #endif break; case FLASH_CFI_64BIT: -#if defined(__LITTLE_ENDIAN) +#if defined(__LITTLE_ENDIAN) && !defined(CONFIG_SOLIDCARD3) ll = c; ll <<= 56; cword->ll = (cword->ll >> 8) | ll; |
