Merge branch 'quad100hd'

[u-boot] / board / freescale / m5329evb / nand.c

diff --git a/board/freescale/m5329evb/nand.c b/board/freescale/m5329evb/nand.c
index 2272a244675443440a996a224e9be42f057467ac..344a614895d62d843ccfcc6f8d2b57736398868e 100644 (file)
--- a/board/freescale/m5329evb/nand.c
+++ b/board/freescale/m5329evb/nand.c
@@ -31,7 +31,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND)
 #include <nand.h>
 #include <linux/mtd/mtd.h>
 
@@ -63,10 +63,10 @@ static void nand_hwcontrol(struct mtd_info *mtdinfo, int cmd)
                nand_baseaddr |= CLR_ALE;
                break;
        case NAND_CTL_SETWP:
-               fbcs->csmr2 |= CSMR_WP;
+               fbcs->csmr2 |= FBCS_CSMR_WP;
                break;
        case NAND_CTL_CLRWP:
-               fbcs->csmr2 &= ~CSMR_WP;
+               fbcs->csmr2 &= ~FBCS_CSMR_WP;
                break;
        }
        this->IO_ADDR_W = (void __iomem *)(nand_baseaddr);