]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Xilinx: ARM: Update NAND driver to match nand_scan_ident()
authorJoe Hershberger <joe.hershberger@ni.com>
Wed, 21 Mar 2012 18:47:18 +0000 (13:47 -0500)
committerJoe Hershberger <joe.hershberger@ni.com>
Wed, 21 Mar 2012 18:47:18 +0000 (13:47 -0500)
nand_scan_ident() has been updated to match Linux...
Remove special case.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
board/xilinx/dfe/xilinx_nandpss.c

index 0b8fa102648ca0ec97fe3815842801667f3c4885..99eb9a005e3d02beaea3943c3522c276b0c82c26 100644 (file)
@@ -1117,11 +1117,7 @@ int board_nand_init(struct nand_chip *nand_chip)
        xnandpss_init_nand_flash(xnand->smc_regs, nand_chip->options);
 
        /* first scan to find the device and get the page size */
-#ifdef LINUX_ONLY_NOT_UBOOT
        if (nand_scan_ident(mtd, 1, NULL)) {
-#else
-       if (nand_scan_ident(mtd, 1)) {
-#endif
                err = -ENXIO;
                dev_err(&pdev->dev, "nand_scan_ident for NAND failed\n");
                goto out_unmap_all_mem;