TQM8xx: use the CFI flash driver on all TQM8xx boards

[people/ms/u-boot.git] / board / tqm8xx / flash.c

diff --git a/board/tqm8xx/flash.c b/board/tqm8xx/flash.c
index db0a7e5eb86bc345e76c0ca3c201fe515d248fc1..4342ebc8419321af0f821bb69d0c40aa932b91ec 100644 (file)
--- 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) */