From a89a990159d450765b8a5675e640525bc6258d1b Mon Sep 17 00:00:00 2001 From: Stefan Roese <sr@denx.de> Date: Wed, 4 May 2011 11:44:44 +0200 Subject: [PATCH] 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> --- nand_spl/nand_boot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/nand_spl/nand_boot.c b/nand_spl/nand_boot.c index 46285241e18..06c6f6de77c 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) -- GitLab