diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-12-27 02:01:15 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-12-27 02:01:15 +0100 |
| commit | 0dcfe3a225a9436fc514f374a19242c672f1172b (patch) | |
| tree | 7ac3f382538d8919e475c6eaed25abb1af71e005 /board/tqm8xx/flash.c | |
| parent | 61fb15c516fef5631e305f1976d7b3a679725856 (diff) | |
| parent | 33ed73bc0e38d0f2b5c183d4629d8f207e5b9994 (diff) | |
| download | u-boot-imx-0dcfe3a225a9436fc514f374a19242c672f1172b.zip u-boot-imx-0dcfe3a225a9436fc514f374a19242c672f1172b.tar.gz u-boot-imx-0dcfe3a225a9436fc514f374a19242c672f1172b.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'board/tqm8xx/flash.c')
| -rw-r--r-- | board/tqm8xx/flash.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/board/tqm8xx/flash.c b/board/tqm8xx/flash.c index db0a7e5..4342ebc 100644 --- a/board/tqm8xx/flash.c +++ b/board/tqm8xx/flash.c @@ -33,6 +33,8 @@ DECLARE_GLOBAL_DATA_PTR; +#if !defined(CFG_FLASH_CFI_DRIVER) /* do not use if CFI driver is configured */ + #if defined(CONFIG_TQM8xxL) && !defined(CONFIG_TQM866M) \ && !defined(CONFIG_TQM885D) # ifndef CFG_OR_TIMING_FLASH_AT_50MHZ @@ -828,3 +830,5 @@ static int write_word (flash_info_t *info, ulong dest, ulong data) /*----------------------------------------------------------------------- */ + +#endif /* !defined(CFG_FLASH_CFI_DRIVER) */ |