diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-28 19:57:38 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-28 19:57:38 +0100 |
| commit | 68435fa1519cb92493fd59e05bc9dbe7f2205feb (patch) | |
| tree | c9f8c096f08608c1307e8ea59f061b265c6ebb66 /include/dataflash.h | |
| parent | d5251742a7b2465c8de2841bc7db5a1e059c13a3 (diff) | |
| parent | 623e03256e222b42fb86fd81fafe508e3cb569a4 (diff) | |
| download | olio-uboot-2014.01-68435fa1519cb92493fd59e05bc9dbe7f2205feb.tar.xz olio-uboot-2014.01-68435fa1519cb92493fd59e05bc9dbe7f2205feb.zip | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
MAKEALL: drop obsolete mx31pdk_nand target
dataflash: fix parameters order in write_dataflash()
hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines
davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board
davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board
arm: a320evb: define mach-type in board config file
OMAP3: Use sdelay from arch/arm/cpu/armv7/syslib.c instead of cloning that.
Fix Stelian's email address
Diffstat (limited to 'include/dataflash.h')
| -rw-r--r-- | include/dataflash.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/dataflash.h b/include/dataflash.h index 056e18b03..94f86b3a3 100644 --- a/include/dataflash.h +++ b/include/dataflash.h @@ -207,7 +207,8 @@ extern int addr2ram(ulong addr); extern int dataflash_real_protect (int flag, unsigned long start_addr, unsigned long end_addr); extern int addr_dataflash (unsigned long addr); extern int read_dataflash (unsigned long addr, unsigned long size, char *result); -extern int write_dataflash (unsigned long addr, unsigned long dest, unsigned long size); +extern int write_dataflash(unsigned long addr_dest, unsigned long addr_src, + unsigned long size); extern int AT91F_DataflashInit(void); extern void dataflash_print_info (void); |