projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-at91
[oweals/u-boot.git]
/
onenand_ipl
/
onenand_ipl.h
diff --git
a/onenand_ipl/onenand_ipl.h
b/onenand_ipl/onenand_ipl.h
index b9c6669a7b3c374cbd412305b8a8afb1e1a8f72e..412572a08dcc59372d5da411e3d532852e8d10e7 100644
(file)
--- a/
onenand_ipl/onenand_ipl.h
+++ b/
onenand_ipl/onenand_ipl.h
@@
-23,22
+23,13
@@
#include <linux/mtd/onenand_regs.h>
#include <linux/mtd/onenand_regs.h>
-#define
ONENAND_START_BLOCK 0
-#define
ONENAND_BLOCK_SIZE 2048
+#define
onenand_readw(a) readw(THIS_ONENAND(a))
+#define
onenand_writew(v, a) writew(v, THIS_ONENAND(a))
-#ifndef CFG_PRINTF
-#define printf(format, args...)
-#endif
-
-#define onenand_readw(a) readw(a)
-#define onenand_writew(v, a) writew(v, a)
-
-#define THIS_ONENAND(a) (CFG_ONENAND_BASE + (a))
+#define THIS_ONENAND(a) (CONFIG_SYS_ONENAND_BASE + (a))
#define READ_INTERRUPT() \
onenand_readw(THIS_ONENAND(ONENAND_REG_INTERRUPT))
#define READ_INTERRUPT() \
onenand_readw(THIS_ONENAND(ONENAND_REG_INTERRUPT))
-#define ONENAND_PAGE_SIZE 2048
-
-extern int onenand_read_block(unsigned char *buf, ulong block);
+extern int onenand_read_block(unsigned char *buf);
#endif
#endif