summaryrefslogtreecommitdiff
path: root/board/wepep250/flash.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2007-11-20 08:19:56 -0700
committerGrant Likely <grant.likely@secretlab.ca>2007-11-20 08:19:56 -0700
commitf92edbd8a0ef16a2b9127cbb564c09685728e4b0 (patch)
treeae33aacff092561e2c64eabc11a8adc5e2acea6b /board/wepep250/flash.c
parentefe33035acd5f7c13963a4d52e5aac1b68612ae4 (diff)
parent9a337ddc154a10a26f117fd147b009abcdeba75a (diff)
downloadu-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.zip
u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.tar.gz
u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.tar.bz2
Merge branch 'origin' into kconfig-for-1.3.1
Diffstat (limited to 'board/wepep250/flash.c')
-rw-r--r--board/wepep250/flash.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/board/wepep250/flash.c b/board/wepep250/flash.c
index 2a32290..e2e08f7 100644
--- a/board/wepep250/flash.c
+++ b/board/wepep250/flash.c
@@ -44,6 +44,7 @@
#if ( WEP_FLASH_BUS_WIDTH == 1 )
# define FLASH_BUS vu_char
+# define FLASH_BUS_RET u_char
# if ( WEP_FLASH_INTERLEAVE == 1 )
# define FLASH_CMD( x ) x
# else
@@ -53,6 +54,7 @@
#elif ( WEP_FLASH_BUS_WIDTH == 2 )
# define FLASH_BUS vu_short
+# define FLASH_BUS_RET u_short
# if ( WEP_FLASH_INTERLEAVE == 1 )
# define FLASH_CMD( x ) x
# elif ( WEP_FLASH_INTERLEAVE == 2 )
@@ -64,6 +66,7 @@
#elif ( WEP_FLASH_BUS_WIDTH == 4 )
# define FLASH_BUS vu_long
+# define FLASH_BUS_RET u_long
# if ( WEP_FLASH_INTERLEAVE == 1 )
# define FLASH_CMD( x ) x
# elif ( WEP_FLASH_INTERLEAVE == 2 )
@@ -81,7 +84,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS];
-static FLASH_BUS flash_status_reg (void)
+static FLASH_BUS_RET flash_status_reg (void)
{
FLASH_BUS *addr = (FLASH_BUS *) 0;