diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-06-03 00:19:57 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-06-03 00:19:57 +0200 |
| commit | 7a68389a231ac061ba2ffd628f86e15ed0545a7b (patch) | |
| tree | 723fd35290b988810be6d417c21fa1949f25aae8 /board/atmel/atstk1000/flash.c | |
| parent | 7feb4d38ff1fdf8877f39447001ff9f6e93fa6bc (diff) | |
| parent | a8092c021d27f27f4b323b7d49979ca01b3fc19d (diff) | |
| download | u-boot-imx-7a68389a231ac061ba2ffd628f86e15ed0545a7b.zip u-boot-imx-7a68389a231ac061ba2ffd628f86e15ed0545a7b.tar.gz u-boot-imx-7a68389a231ac061ba2ffd628f86e15ed0545a7b.tar.bz2 | |
Merge remote branch 'u-boot-avr32/master'
Diffstat (limited to 'board/atmel/atstk1000/flash.c')
| -rw-r--r-- | board/atmel/atstk1000/flash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/atmel/atstk1000/flash.c b/board/atmel/atstk1000/flash.c index 4047825..12537f3 100644 --- a/board/atmel/atstk1000/flash.c +++ b/board/atmel/atstk1000/flash.c @@ -30,7 +30,7 @@ DECLARE_GLOBAL_DATA_PTR; flash_info_t flash_info[1]; -static void __flashprog flash_identify(uint16_t *flash, flash_info_t *info) +static void flash_identify(uint16_t *flash, flash_info_t *info) { unsigned long flags; @@ -76,7 +76,7 @@ void flash_print_info(flash_info_t *info) info->size >> 10, info->sector_count); } -int __flashprog flash_erase(flash_info_t *info, int s_first, int s_last) +int flash_erase(flash_info_t *info, int s_first, int s_last) { unsigned long flags; unsigned long start_time; @@ -154,7 +154,7 @@ int __flashprog flash_erase(flash_info_t *info, int s_first, int s_last) return ERR_OK; } -int __flashprog write_buff(flash_info_t *info, uchar *src, +int write_buff(flash_info_t *info, uchar *src, ulong addr, ulong count) { unsigned long flags; |