projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
microblaze: Enable hardware exception by default
[oweals/u-boot.git]
/
common
/
flash.c
diff --git
a/common/flash.c
b/common/flash.c
index f1440c2c18ebd0fd025db45e4385f7eaee19203a..fa33f03d2ed3e285267c2fd1b3f8448b7db59ab6 100644
(file)
--- a/
common/flash.c
+++ b/
common/flash.c
@@
-88,7
+88,6
@@
flash_protect (int flag, ulong from, ulong to, flash_info_t *info)
flash_info_t *
addr2info (ulong addr)
{
flash_info_t *
addr2info (ulong addr)
{
-#ifndef CONFIG_SPD823TS
flash_info_t *info;
int i;
flash_info_t *info;
int i;
@@
-104,7
+103,6
@@
addr2info (ulong addr)
return (info);
}
}
return (info);
}
}
-#endif /* CONFIG_SPD823TS */
return (NULL);
}
return (NULL);
}
@@
-125,9
+123,6
@@
addr2info (ulong addr)
int
flash_write (char *src, ulong addr, ulong cnt)
{
int
flash_write (char *src, ulong addr, ulong cnt)
{
-#ifdef CONFIG_SPD823TS
- return (ERR_TIMOUT); /* any other error codes are possible as well */
-#else
int i;
ulong end = addr + cnt - 1;
flash_info_t *info_first = addr2info (addr);
int i;
ulong end = addr + cnt - 1;
flash_info_t *info_first = addr2info (addr);
@@
-181,7
+176,6
@@
flash_write (char *src, ulong addr, ulong cnt)
#endif /* CONFIG_SYS_FLASH_VERIFY_AFTER_WRITE */
return (ERR_OK);
#endif /* CONFIG_SYS_FLASH_VERIFY_AFTER_WRITE */
return (ERR_OK);
-#endif /* CONFIG_SPD823TS */
}
/*-----------------------------------------------------------------------
}
/*-----------------------------------------------------------------------