summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorMartin Krause <martin.krause@tqs.de>2007-09-27 11:10:08 +0200
committerWolfgang Denk <wd@denx.de>2007-12-27 02:00:10 +0100
commite318d9e9021a0af7508171f84ed09d0e79f0284e (patch)
treeaaf20f071c0b760825e310fb1b8a8eb06ad137d8 /board
parent11d9eec479b470eab9242ab937fca70a876d9376 (diff)
downloadtalos-obmc-uboot-e318d9e9021a0af7508171f84ed09d0e79f0284e.tar.gz
talos-obmc-uboot-e318d9e9021a0af7508171f84ed09d0e79f0284e.zip
TQM8xx: use the CFI flash driver on all TQM8xx boards
Signed-off-by: Martin Krause <martin.krause@tqs.de>
Diffstat (limited to 'board')
-rw-r--r--board/tqm8xx/flash.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/board/tqm8xx/flash.c b/board/tqm8xx/flash.c
index db0a7e5eb8..4342ebc841 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) */
OpenPOWER on IntegriCloud