summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHeiko Schocher <hs@pollux.denx.de>2007-01-18 11:28:51 +0100
committerHeiko Schocher <hs@pollux.denx.de>2007-01-18 11:28:51 +0100
commitcb4820725e9fc409c5cbc8e83054a6ed522d2111 (patch)
tree52c0972ffd2bc7a66e229ebb9ebcff9d9cb248ff /drivers
parent6d3e0107235aa0e6a6dcb77f9884497280bf85ad (diff)
downloadu-boot-imx-cb4820725e9fc409c5cbc8e83054a6ed522d2111.zip
u-boot-imx-cb4820725e9fc409c5cbc8e83054a6ed522d2111.tar.gz
u-boot-imx-cb4820725e9fc409c5cbc8e83054a6ed522d2111.tar.bz2
[PATCH] Fix: Compilerwarnings for SC3 board.
The EBC Configuration Register is now by CFG_EBC_CFG definable Added JFFS2 support for the SC3 board. Signed-off-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cfi_flash.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/cfi_flash.c b/drivers/cfi_flash.c
index 8dc4499..665d8e7 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;