Sync with 2.6.27

[u-boot] / drivers / mtd / onenand / onenand_uboot.c

diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c
index bd7466ac9d95dc8155790c36ff4f46f3d18e6d74..4541b221772b35d140eae003fd821077b6116807 100644 (file)
--- a/drivers/mtd/onenand/onenand_uboot.c
+++ b/drivers/mtd/onenand/onenand_uboot.c
@@ -14,9 +14,6 @@
  */
 
 #include <common.h>
-
-#ifdef CONFIG_CMD_ONENAND
-
 #include <linux/mtd/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
@@ -29,13 +26,19 @@ void onenand_init(void)
        memset(&onenand_mtd, 0, sizeof(struct mtd_info));
        memset(&onenand_chip, 0, sizeof(struct onenand_chip));
 
-       onenand_chip.base = (void *) CFG_ONENAND_BASE;
        onenand_mtd.priv = &onenand_chip;
 
+#ifdef CONFIG_USE_ONENAND_BOARD_INIT
+       /*
+        * It's used for some board init required
+        */
+       onenand_board_init(&onenand_mtd);
+#else
+       onenand_chip.base = (void *) CONFIG_SYS_ONENAND_BASE;
+#endif
+
        onenand_scan(&onenand_mtd, 1);
 
        puts("OneNAND: ");
        print_size(onenand_mtd.size, "\n");
 }
-
-#endif /* CONFIG_CMD_ONENAND */