diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-01-28 21:09:32 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-01-28 21:09:32 +0100 |
| commit | ee64d0acc93f4f15850736eafaacdeadd7f12d25 (patch) | |
| tree | c3cbea9a94ac333eaaaa0f6d277d5b6c1fe9759c /board/bf537-stamp/nand.c | |
| parent | 9cda4f104b5313fadc21b75aa781c7a6aaf6ea60 (diff) | |
| parent | fe033ad6d0883063fe857237abb9436fab03208c (diff) | |
| download | u-boot-imx-ee64d0acc93f4f15850736eafaacdeadd7f12d25.zip u-boot-imx-ee64d0acc93f4f15850736eafaacdeadd7f12d25.tar.gz u-boot-imx-ee64d0acc93f4f15850736eafaacdeadd7f12d25.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'board/bf537-stamp/nand.c')
| -rw-r--r-- | board/bf537-stamp/nand.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/board/bf537-stamp/nand.c b/board/bf537-stamp/nand.c index 20a7d0e..181e83d 100644 --- a/board/bf537-stamp/nand.c +++ b/board/bf537-stamp/nand.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2006 Aubrey.Li, aubrey.li@analog.com + * Copyright (c) 2006-2007 Analog Devices Inc. * * See file CREDITS for list of people who contributed to this * project. @@ -23,8 +23,6 @@ #include <common.h> #include <asm/io.h> -#if defined(CONFIG_CMD_NAND) - #include <nand.h> #define CONCAT(a,b,c,d) a ## b ## c ## d @@ -43,11 +41,11 @@ static void bfin_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl) u32 IO_ADDR_W = (u32) this->IO_ADDR_W; if (ctrl & NAND_CTRL_CHANGE) { - if( ctrl & NAND_CLE ) + if (ctrl & NAND_CLE) IO_ADDR_W = CONFIG_SYS_NAND_BASE + BFIN_NAND_CLE; else IO_ADDR_W = CONFIG_SYS_NAND_BASE; - if( ctrl & NAND_ALE ) + if (ctrl & NAND_ALE) IO_ADDR_W = CONFIG_SYS_NAND_BASE + BFIN_NAND_ALE; else IO_ADDR_W = CONFIG_SYS_NAND_BASE; @@ -100,4 +98,3 @@ int board_nand_init(struct nand_chip *nand) return 0; } -#endif |