commit e318d9e9021a0af7508171f84ed09d0e79f0284e
author Martin Krause <martin.krause@tqs.de> Thu Sep 27 11:10:08 2007 +0200
committer Wolfgang Denk <wd@denx.de> Thu Dec 27 02:00:10 2007 +0100
tree aaf20f071c0b760825e310fb1b8a8eb06ad137d8
parent 11d9eec479b470eab9242ab937fca70a876d9376

TQM8xx: use the CFI flash driver on all TQM8xx boards

Signed-off-by: Martin Krause <martin.krause@tqs.de>

board/tqm8xx/flash.c

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 @@
 
 /*-----------------------------------------------------------------------
  */
+
+#endif /* !defined(CFG_FLASH_CFI_DRIVER) */