summaryrefslogtreecommitdiffstats
path: root/include/configs/TQM85xx.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-08-13 23:23:13 +0200
committerWolfgang Denk <wd@denx.de>2008-08-13 23:23:13 +0200
commit2fd0aad443c966ce62008225e57b18e2dcf4e330 (patch)
treea9166e535df4d867ce73eca3fd97ebc500ecf771 /include/configs/TQM85xx.h
parent5a7ddf4e1fb9347f783eb1473c30187d7a22bd81 (diff)
parent9483df6408c25f16060432de3868901e352e23bc (diff)
downloadtalos-obmc-uboot-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.gz
talos-obmc-uboot-2fd0aad443c966ce62008225e57b18e2dcf4e330.zip
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/TQM85xx.h')
-rw-r--r--include/configs/TQM85xx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index d18f2346c6..d84554e37d 100644
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -204,7 +204,7 @@
#endif /* CONFIG_TQM_BIGFLASH */
#define CFG_FLASH_CFI /* flash is CFI compat. */
-#define CFG_FLASH_CFI_DRIVER /* Use common CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER /* Use common CFI driver */
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector */
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash*/
#define CFG_FLASH_USE_BUFFER_WRITE 1 /* speed up output to Flash */
@@ -345,7 +345,7 @@
/* NAND FLASH */
#ifdef CONFIG_NAND
-#undef CFG_NAND_LEGACY
+#undef CONFIG_NAND_LEGACY
#define CONFIG_NAND_FSL_UPM 1
OpenPOWER on IntegriCloud