projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PXA: Add initial Palm LifeDrive support
[oweals/u-boot.git]
/
board
/
jse
/
flash.c
diff --git
a/board/jse/flash.c
b/board/jse/flash.c
index c462fe0315a3e96de64ee986460eea94406732de..5735f19b8d548f50fbf78de9a351c473ba4f65d9 100644
(file)
--- a/
board/jse/flash.c
+++ b/
board/jse/flash.c
@@
-29,13
+29,13
@@
*/
#include <common.h>
*/
#include <common.h>
-#include <ppc4xx.h>
+#include <
asm/
ppc4xx.h>
#include <asm/processor.h>
#include <asm/processor.h>
-#if C
FG
_MAX_FLASH_BANKS != 1
-#error "C
FG
_MAX_FLASH_BANKS must be 1"
+#if C
ONFIG_SYS
_MAX_FLASH_BANKS != 1
+#error "C
ONFIG_SYS
_MAX_FLASH_BANKS must be 1"
#endif
#endif
-flash_info_t flash_info[C
FG_MAX_FLASH_BANKS];
/* info for FLASH chips */
+flash_info_t flash_info[C
ONFIG_SYS_MAX_FLASH_BANKS];
/* info for FLASH chips */
/*-----------------------------------------------------------------------
* Functions
/*-----------------------------------------------------------------------
* Functions
@@
-281,7
+281,7
@@
int wait_for_DQ7 (flash_info_t * info, int sect)
last = start;
while ((addr[0] & (FLASH_WORD_SIZE) 0x00800080) !=
(FLASH_WORD_SIZE) 0x00800080) {
last = start;
while ((addr[0] & (FLASH_WORD_SIZE) 0x00800080) !=
(FLASH_WORD_SIZE) 0x00800080) {
- if ((now = get_timer (start)) > C
FG
_FLASH_ERASE_TOUT) {
+ if ((now = get_timer (start)) > C
ONFIG_SYS
_FLASH_ERASE_TOUT) {
printf ("Timeout\n");
return -1;
}
printf ("Timeout\n");
return -1;
}
@@
-510,7
+510,7
@@
static int write_word (flash_info_t * info, ulong dest, ulong data)
while ((dest2[i] & (FLASH_WORD_SIZE) 0x00800080) !=
(data2[i] & (FLASH_WORD_SIZE) 0x00800080)) {
while ((dest2[i] & (FLASH_WORD_SIZE) 0x00800080) !=
(data2[i] & (FLASH_WORD_SIZE) 0x00800080)) {
- if (get_timer (start) > C
FG
_FLASH_WRITE_TOUT) {
+ if (get_timer (start) > C
ONFIG_SYS
_FLASH_WRITE_TOUT) {
return (1);
}
}
return (1);
}
}