Merge branch 'mimc200'

[u-boot] / onenand_ipl / onenand_ipl.h

diff --git a/onenand_ipl/onenand_ipl.h b/onenand_ipl/onenand_ipl.h
index b9c6669a7b3c374cbd412305b8a8afb1e1a8f72e..3387998a97aa380357c04bc18adcf3c9ad7499c6 100644 (file)
--- a/onenand_ipl/onenand_ipl.h
+++ b/onenand_ipl/onenand_ipl.h
@@ -23,22 +23,21 @@
 
 #include <linux/mtd/onenand_regs.h>
 
-#define ONENAND_START_BLOCK             0
 #define ONENAND_BLOCK_SIZE              2048
 
-#ifndef CFG_PRINTF
+#ifndef CONFIG_SYS_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 ONENAND_PAGE_SIZE                       2048
 
-extern int onenand_read_block(unsigned char *buf, ulong block);
+extern int onenand_read_block0(unsigned char *buf);
 #endif