From: Stefan Roese <sr@denx.de>
Date: Wed, 4 May 2011 09:44:44 +0000 (+0200)
Subject: nand_spl: nand_boot.c: Init nand_chip.options to 0
X-Git-Tag: v2011.06-rc1~27^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a89a990159d450765b8a5675e640525bc6258d1b;p=u-boot

nand_spl: nand_boot.c: Init nand_chip.options to 0

Patch 65a9db7b [nand_spl: Fix large page nand_command()] broke
nand booting on canyonlands. "options" has to be initialized to
0. If not, boards might have the NAND_BUSWIDTH_16 bit set,
resulting in wrong offset calculation.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Alex Waterman <awaterman@dawning.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
---

diff --git a/nand_spl/nand_boot.c b/nand_spl/nand_boot.c
index 46285241e1..06c6f6de77 100644
--- a/nand_spl/nand_boot.c
+++ b/nand_spl/nand_boot.c
@@ -246,6 +246,7 @@ void nand_boot(void)
 	nand_info.priv = &nand_chip;
 	nand_chip.IO_ADDR_R = nand_chip.IO_ADDR_W = (void  __iomem *)CONFIG_SYS_NAND_BASE;
 	nand_chip.dev_ready = NULL;	/* preset to NULL */
+	nand_chip.options = 0;
 	board_nand_init(&nand_chip);
 
 	if (nand_chip.select_chip)