summaryrefslogtreecommitdiff
path: root/board/at91sam9g20ek/nand.c
diff options
context:
space:
mode:
Diffstat (limited to 'board/at91sam9g20ek/nand.c')
-rw-r--r--board/at91sam9g20ek/nand.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/board/at91sam9g20ek/nand.c b/board/at91sam9g20ek/nand.c
index 2a339a9ed7..d632399358 100644
--- a/board/at91sam9g20ek/nand.c
+++ b/board/at91sam9g20ek/nand.c
@@ -23,7 +23,7 @@
#include <common.h>
#include <asm/arch/hardware.h>
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND)
#include <nand.h>
@@ -95,7 +95,7 @@ static int at91sam9260ek_nand_ready(struct mtd_info *mtd)
return (*AT91C_PIOC_PDSR & AT91C_PIO_PC13);
}
-void board_nand_init(struct nand_chip *nand)
+int board_nand_init(struct nand_chip *nand)
{
nand->eccmode = NAND_ECC_SOFT;
nand->hwcontrol = at91sam9260ek_nand_hwcontrol;
@@ -103,5 +103,7 @@ void board_nand_init(struct nand_chip *nand)
nand->chip_delay = 18;
at91sam9260ek_nand_init(nand);
+
+ return 0;
}
#endif