diff options
author | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
commit | f61f1e150c84f5b9347fca79a4bc5f2286c545d2 (patch) | |
tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /board/quad100hd/nand.c | |
parent | ec081c2c190148b374e86a795fb6b1c49caeb549 (diff) | |
parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
download | u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.zip u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.gz u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.bz2 |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'board/quad100hd/nand.c')
-rw-r--r-- | board/quad100hd/nand.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/board/quad100hd/nand.c b/board/quad100hd/nand.c index 766ee95..35525bc 100644 --- a/board/quad100hd/nand.c +++ b/board/quad100hd/nand.c @@ -37,9 +37,9 @@ static void quad100hd_hwcontrol(struct mtd_info *mtd, struct nand_chip *this = mtd->priv; if (ctrl & NAND_CTRL_CHANGE) { - gpio_write_bit(CFG_NAND_CLE, !!(ctrl & NAND_CLE)); - gpio_write_bit(CFG_NAND_ALE, !!(ctrl & NAND_ALE)); - gpio_write_bit(CFG_NAND_CE, !(ctrl & NAND_NCE)); + gpio_write_bit(CONFIG_SYS_NAND_CLE, !!(ctrl & NAND_CLE)); + gpio_write_bit(CONFIG_SYS_NAND_ALE, !!(ctrl & NAND_ALE)); + gpio_write_bit(CONFIG_SYS_NAND_CE, !(ctrl & NAND_NCE)); } if (cmd != NAND_CMD_NONE) @@ -48,7 +48,7 @@ static void quad100hd_hwcontrol(struct mtd_info *mtd, static int quad100hd_nand_ready(struct mtd_info *mtd) { - return gpio_read_in_bit(CFG_NAND_RDY); + return gpio_read_in_bit(CONFIG_SYS_NAND_RDY); } /* |