diff options
author | Markus Klotzbuecher <mk@denx.de> | 2008-07-21 12:37:56 +0200 |
---|---|---|
committer | Markus Klotzbuecher <mk@denx.de> | 2008-07-21 12:37:56 +0200 |
commit | ab06bddb04ed4be50a8f9ad5f94fa23953a734e3 (patch) | |
tree | 5df2528b42f073dd5bbb34b14f288a1811073729 /board/ml2/flash.c | |
parent | 262423955895ba4599fa11d7c49dcffb65af0afd (diff) | |
parent | 1953d128fd07f07d1c3810a28c0863ea64dae1b6 (diff) | |
download | u-boot-imx-ab06bddb04ed4be50a8f9ad5f94fa23953a734e3.zip u-boot-imx-ab06bddb04ed4be50a8f9ad5f94fa23953a734e3.tar.gz u-boot-imx-ab06bddb04ed4be50a8f9ad5f94fa23953a734e3.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'board/ml2/flash.c')
-rw-r--r-- | board/ml2/flash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/ml2/flash.c b/board/ml2/flash.c index 87cb1ff..ad0f075 100644 --- a/board/ml2/flash.c +++ b/board/ml2/flash.c @@ -222,7 +222,7 @@ static int write_word (flash_info_t *info, ulong dest, unsigned long long data) unsigned long long result; int rc = ERR_OK; - result=*addr; + result = *addr; if ((result & data) != data) return ERR_NOT_ERASED; @@ -234,7 +234,7 @@ static int write_word (flash_info_t *info, ulong dest, unsigned long long data) eieio(); do { - result=*addr; + result = *addr; } while(~result & BIT_BUSY); *addr=CMD_READ_ARRAY; @@ -275,7 +275,7 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt) { } while(cnt>=8) { - data=*((unsigned long long *)src); + data = *((unsigned long long *)src); if ((rc = write_word(info, wp, data)) != 0) return rc; src+=8; |