aboutsummaryrefslogtreecommitdiff
path: root/nand_spl
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2011-05-04 11:44:44 +0200
committerScott Wood <scottwood@freescale.com>2011-05-13 11:07:49 -0500
commita89a990159d450765b8a5675e640525bc6258d1b (patch)
tree115356b911bbc5b4b53b0c89a4fdd67311d4f94b /nand_spl
parent8370978318337df3979aa0852529d53d77ed736e (diff)
downloadu-boot-linaro-stable-a89a990159d450765b8a5675e640525bc6258d1b.tar.gz
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>
Diffstat (limited to 'nand_spl')
-rw-r--r--nand_spl/nand_boot.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/nand_spl/nand_boot.c b/nand_spl/nand_boot.c
index 46285241e..06c6f6de7 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)