X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=include%2Fnand.h;h=a48b1b8ed1a514831511303abca62cb48fccb96d;hb=7b15e2bb9b1026925f0f98243cd6cf80bd3fb47d;hp=d444ddcefea7c37a9dbb96aa97f10109b39cd0ce;hpb=c786f54b9ace5d7b20a0404a7deb1bae683cd4e8;p=karo-tx-uboot.git

diff --git a/include/nand.h b/include/nand.h
index d444ddcefe..a48b1b8ed1 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -24,13 +24,29 @@
 #ifndef _NAND_H_
 #define _NAND_H_
 
+#include <config.h>
+
+/*
+ * All boards using a given driver must convert to self-init
+ * at the same time, so do it here.  When all drivers are
+ * converted, this will go away.
+ */
+#if defined(CONFIG_NAND_FSL_ELBC)
+#define CONFIG_SYS_NAND_SELF_INIT
+#endif
+
 extern void nand_init(void);
 
-#include <linux/mtd/compat.h>
+#include <linux/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 
+#ifdef CONFIG_SYS_NAND_SELF_INIT
+void board_nand_init(void);
+int nand_register(int devnum);
+#else
 extern int board_nand_init(struct nand_chip *nand);
+#endif
 
 typedef struct mtd_info nand_info_t;