minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-08 19:47:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicting types (flash_write()) in esd auto_update.c

Browse Source 
Patch by Stefan Roese, 20 Oct 2005
This commit is contained in:
Stefan Roese 2005-10-20 16:39:16 +02:00
parent c4c13df284
commit a547775bac
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -2,6 +2,9 @@
Changes for U-Boot 1.1.4: Changes for U-Boot 1.1.4:
====================================================================== ======================================================================
* Fix conflicting types (flash_write()) in esd auto_update.c
Patch by Stefan Roese, 20 Oct 2005
* Fix problem with sleep in NetConsole (use get_timer()) * Fix problem with sleep in NetConsole (use get_timer())
Patch by Stefan Roese, 20 Oct 2005 Patch by Stefan Roese, 20 Oct 2005

2
board/esd/common/auto_update.c
View File

@ -65,7 +65,7 @@ extern int transfer_pic(unsigned char, unsigned char *, int, int);
#endif #endif
extern int flash_sect_erase(ulong, ulong); extern int flash_sect_erase(ulong, ulong);
extern int flash_sect_protect (int, ulong, ulong); extern int flash_sect_protect (int, ulong, ulong);
extern int flash_write (uchar *, ulong, ulong); extern int flash_write (char *, ulong, ulong);
/* change char* to void* to shutup the compiler */ /* change char* to void* to shutup the compiler */
extern block_dev_desc_t *get_dev (char*, int); extern block_dev_desc_t *get_dev (char*, int);